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

[Resprite] Stamps #519

Merged
merged 3 commits into from
Nov 6, 2022
Merged

[Resprite] Stamps #519

merged 3 commits into from
Nov 6, 2022

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Nov 6, 2022

Описание PR

Новые спрайты печатей с ТГ.

Скриншоты

image

Изменения

🆑 Morty

  • tweak: Изменены спрайты печатей

@github-actions github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: No C# Code has not been changed labels Nov 6, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Nov 6, 2022

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

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-approve Modified
paper_stamp-cap Modified
paper_stamp-ce Modified
paper_stamp-cent Modified
paper_stamp-chaplain Modified
paper_stamp-clown Modified
paper_stamp-cmo Modified
paper_stamp-deny Modified
paper_stamp-hop Modified
paper_stamp-hos Modified
paper_stamp-mime Modified
paper_stamp-qm Modified
paper_stamp-rd Modified
paper_stamp-syndicate Modified
stamp-cap Modified
stamp-ce Modified
stamp-cent Modified
stamp-chaplain Modified
stamp-clown Modified
stamp-cmo Modified
stamp-deny Modified
stamp-hop Modified
stamp-hos Modified
stamp-iaa Modified
stamp-mime Modified
stamp-qm Modified
stamp-rd Modified
stamp-syndicate Modified
stamp-warden Modified
stamp-approve Added

@Morb0 Morb0 merged commit 231d566 into master Nov 6, 2022
@Morb0 Morb0 deleted the resprite/stamp branch November 6, 2022 19:56
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>

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/47865d65-754d-4b70-9c10-19bc9aa55ac6)

</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>

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

</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>

![ArchnePlush](https://github.com/Simple-Station/Einstein-Engines/assets/114866135/1ec47181-4827-49f9-8605-9a16764dba89)

</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
Labels
Changes: No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant