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

Plushie Update! #654

Merged
merged 14 commits into from
Aug 13, 2024
Merged

Plushie Update! #654

merged 14 commits into from
Aug 13, 2024

Conversation

FoxxoTrystan
Copy link
Contributor

@FoxxoTrystan FoxxoTrystan commented Aug 2, 2024 •
edited
Loading

Description

By multiple requests i bring my PR from Frontier The PLUSHIE UPDATE!

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

  • Prize Vendor
  • Prize Tickets
  • New Toys/Plushies
  • Prizes

Media

image

Changelog

🆑

  • 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!!

@github-actions github-actions bot added Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 2, 2024 •
edited
Loading

RSI Diff Bot; head commit 7fd2e88 merging into a425aeb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Fun/catplushie.rsi

State Old New Status
black Added
grey Added
orange Added
siames Added
tabby Added
tuxedo Added
white Added

Resources/Textures/Objects/Fun/corgiplushie.rsi

State Old New Status
corgi Added
girlycorgi Added
robotcorgi Added

Resources/Textures/Objects/Fun/foxplushie.rsi

State Old New Status
black Added
blue Added
coffee Added
crimson Added
marble Added
orange Added
pink Added
purple Added
red Added

Resources/Textures/Objects/Fun/petrock.rsi

State Old New Status
fred Added
rock Added
roxie Added

Resources/Textures/Objects/Fun/prizeticket.rsi

State Old New Status
prizeball Added
ticket Added
ticket_2 Added
ticket_3 Added
ticket_4 Added

Resources/Textures/Objects/Fun/toys.rsi

State Old New Status
abductor Added
abductor_agent Added
deer Added
gnome Added
grey Added
ipc Added
loveable Added
plushie_jester Added
plushie_slips Added
plushie_trystan Added
plushie_vulp Added

Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/Structures/Machines/prizecounter.rsi

State Old New Status
icon Added
panel Added
unlit Added

Edit: diff updated after 7fd2e88

@DangerRevolution DangerRevolution added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase labels Aug 4, 2024
@FoxxoTrystan FoxxoTrystan marked this pull request as ready for review August 4, 2024 17:03
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Aug 5, 2024
DangerRevolution
DangerRevolution suggested changes Aug 5, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Plushies should be put into antag objectives

Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml
sprite: Objects/Fun/prizeticket.rsi
layers:
- state: prizeball
- type: SpawnItemsOnUse
Copy link
Contributor

Choose a reason for hiding this comment

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

This is gross.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is how Presents is done sadly i cannot spawn an ent that is just a random plushie as long i would love to have an ent like this... actully could i?

Is it possible to make an ent on init that just get a random plushie?

@FoxxoTrystan
Copy link
Contributor Author

Plushies should be put into antag objectives

Oh Yee.

VMSolidus
VMSolidus previously requested changes Aug 6, 2024
View reviewed changes
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Comment on lines -1 to -47
- type: entity
id: CrateFunPlushie
parent: CrateGenericSteel
name: plushie crate
description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
components:
- type: StorageFill
contents:
- id: PlushieBee
- id: PlushieNar
- id: PlushieCarp
- id: PlushieNuke
- id: PlushieSlime
- id: PlushieSnake
- id: PlushieLizard
- id: PlushieSpaceLizard
- id: PlushieVox
- id: PlushieRouny
- id: PlushieRatvar
- id: PlushieSharkBlue
orGroup: PlushieShark
- id: PlushieSharkGrey
orGroup: PlushieShark
- id: PlushieAtmosian
- id: PlushieDiona
- id: PlushieXeno
- id: PlushieHampter
- id: PlushieMoth
- id: PlushieMothRandom # Nyanotrasen - Random Moth Plushies
amount: 2
- id: PlushieArachind
- id: PlushiePenguin
- id: PlushieArachne

- type: entity
id: CrateFunLizardPlushieBulk
parent: CrateGenericSteel
name: bulk lizard plushie crate
description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
components:
- type: StorageFill
contents:
- id: PlushieLizard
amount: 3
- id: PlushieSpaceLizard
amount: 2

Copy link
Member

Choose a reason for hiding this comment

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

Test fails are legitimate, and this change is why. I need you to revert these item removals before this PR can be merged.
image

@DangerRevolution DangerRevolution requested review from VMSolidus and a team August 9, 2024 10:59
DangerRevolution
DangerRevolution approved these changes Aug 13, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Haven't playtested it, gonna yolo merge it

Resources/Prototypes/Entities/Objects/Fun/puppet.yml
damage:
types:
Blunt: 1
- type: DamageOtherOnHit
Copy link
Contributor

Choose a reason for hiding this comment

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

Lol, go go gadget pet rock!

Resources/Prototypes/Entities/Objects/Fun/toys.yml
components:
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: plushie_jester
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm assuming this is the frontier admin, I like him so this is cool

@DangerRevolution DangerRevolution merged commit 666e820 into Simple-Station:master Aug 13, 2024
13 checks passed
SimpleStation14 added a commit that referenced this pull request Aug 13, 2024
@SimpleStation14
Automatic Changelog Update (#654)
794b8eb
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
@FoxxoTrystan @tim-mcqueen-ttec
Plushie Update! (Simple-Station#654)
9307da0 
<!--
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>


![image](https://github.com/user-attachments/assets/643e6c65-bba0-4eef-8e8e-d3510922e51e)

</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
@SimpleStation14 @tim-mcqueen-ttec
Automatic Changelog Update (Simple-Station#654)
fb95352
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
@SimpleStation14 @tim-mcqueen-ttec
Automatic Changelog Update (Simple-Station#654)
bb2598f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VMSolidus VMSolidus VMSolidus approved these changes

@DangerRevolution DangerRevolution DangerRevolution approved these changes

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

@OldDanceJacket OldDanceJacket Awaiting requested review from OldDanceJacket

Assignees

@FoxxoTrystan FoxxoTrystan

Labels
Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@FoxxoTrystan @VMSolidus @DangerRevolution