Plushie update #886
Merged
Plushie update #886
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
RSI Diff Bot; head commit 7be4f6f merging into 382e24d Resources/Textures/Objects/Fun/toys.rsi
Resources/Textures/_NF/Clothing/Masks/facehuggerplushie.rsi
Resources/Textures/_NF/Objects/Fun/catplushie.rsi
Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi
Resources/Textures/_NF/Objects/Fun/foxplushie.rsi
Resources/Textures/_NF/Objects/Fun/petrock.rsi
Resources/Textures/_NF/Objects/Fun/prizeticket.rsi
Resources/Textures/_NF/Objects/Fun/toys.rsi
Resources/Textures/_NF/Structures/Machines/prizecounter.rsi
|
|
3 rocks feels like beating the joke out of funny - i would just do one also this needs to have the same components as mr chips and mr dips |
|
The pet rock needs to be a ghost role like Mr Chips the dummy, and also need to do some damage when thrown at someone making the rock go into crit. :) |
|
ITS JUST A ROCK! |
|
Its not just a rock it's a real pet |
|
i want the rock to know what love is. And also pain. I want the rock to feel what I feel. |
|
Was curious how you were planning to implement the counter, lathe is a clever solution. |
Cheackraze
approved these changes
Jan 18, 2024
FrontierATC
added a commit
that referenced
this pull request
Jan 18, 2024
4 tasks
DangerRevolution
pushed a commit
to Simple-Station/Einstein-Engines
that referenced
this pull request
Aug 13, 2024
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!!
tmcqueen
pushed a commit
to tmcqueen/Syndicate-Station
that referenced
this pull request
Aug 24, 2024
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!!
PuroSlavKing
added a commit
to Rxup/space-station-14
that referenced
this pull request
Sep 16, 2024
* Plushie Update! (#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]>
PuroSlavKing
added a commit
to Rxup/space-station-14
that referenced
this pull request
Sep 16, 2024
* [Port] Xenowears (#12) * Xenowears (#519) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Add a bit of clothing specie related and some tiny misc changes. Normally i wanted to add the spooders changes here but with the other spider specie coming in il hold myself for now. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Add clothings - [x] Loadouts/Vending machines --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Xenowears! new non-human related clothings. --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * ooopsie --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * [Port] Plushie (#11) * Plushie Update! (#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]> * [Fix] EE Migration (#14) * [Tweak] Add Einstein Engines Folders (#17) * [Tweak] EE Prototypes Folder * [Tweak] EE RU FTL * fix dublicate * yaml fixes --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: CodedCrow <[email protected]>
PuroSlavKing
added a commit
to PuroSlavKing/skibidi-station-69-next
that referenced
this pull request
Nov 25, 2024
* [Port] Xenowears (space-syndicate#12) * Xenowears (space-syndicate#519) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Add a bit of clothing specie related and some tiny misc changes. Normally i wanted to add the spooders changes here but with the other spider specie coming in il hold myself for now. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Add clothings - [x] Loadouts/Vending machines --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Xenowears! new non-human related clothings. --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * ooopsie --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * [Port] Plushie (space-syndicate#11) * Plushie Update! (space-syndicate#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (space-syndicate#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]> * [Fix] EE Migration (space-syndicate#14) * [Tweak] Add Einstein Engines Folders (space-syndicate#17) * [Tweak] EE Prototypes Folder * [Tweak] EE RU FTL * fix dublicate * yaml fixes --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: CodedCrow <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Adds a TON OF PLUSHIES and new ways to get plushies with PrizeBall/Prize Tickets! Aka making playing arcades games and plushies selection more intresting!
Note: @Cheackraze please review and gives opinion for those 2 plushies: "Janitor Plushie and Office Vulp Plushie"
Minor: Fixes Nuke Toy sprite to our current nuke sprite.
Why / Balance
We need MORE PLUSHIES AND TOYS!
And more fun way to get them!
So i have delivered!
MORE PLUSHIES AND TOYS ARE NEEDED!
NOTE: Prize Counter is not mapped on Frontier for the current reason that i want this PR to be simple and only have yml and sprite changes, Prize Counter should be mapped on Frontier when possible.
Technical details
Mostly .yml files and changes, only add new things and only change the arcade machine reward pool and cuddlycritter inv, this PR also avoid any C# changes.
Media
Breaking changes
Changelog
🆑 FoxxoTrystan