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

Couch and Stripper Pole! #139

Merged
merged 11 commits into from
Aug 24, 2024
Merged

Couch and Stripper Pole! #139

merged 11 commits into from
Aug 24, 2024

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Aug 23, 2024

Description

Adds a craftable couch and stripper pole!


Changelog

🆑

  • add: Stripper Pole
  • tweak: Corp Couche can be crafted

@Memeji Memeji requested a review from FoxxoTrystan as a code owner August 23, 2024 20:23
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 23, 2024
@Memeji Memeji self-assigned this Aug 23, 2024
Copy link
Contributor

github-actions bot commented Aug 23, 2024

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

Resources/Textures/Floof/Objects/Fun/Lewd/egg.rsi

State Old New Status
egg_ashwalker Added
egg_badrecipe Added
egg_blue Added
egg_bugcocoon Added
egg_cd Added
egg_chicken Added
egg_chocolate Added
egg_cocoon Added
egg_corrupteddemon Added
egg_dragon Added
egg_escapepod Added
egg_file Added
egg_fish Added
egg_floppy Added
egg_green Added
egg_holy Added
egg_honeycomb Added
egg_hybrid Added
egg_insectoid Added
egg_orange Added
egg_pellet Added
egg_pinkspots Added
egg_polychrome Added
egg_purple Added
egg_rainbow Added
egg_ratvar Added
egg_red Added
egg_rock Added
egg_slimeglob Added
egg_spidercluster Added
egg_synthetic Added
egg_void Added
egg_xenomorph Added
egg_yellow Added

Resources/Textures/Floof/Structures/pole.rsi

State Old New Status
pole Added
pole_base Added

Edit: diff updated after 92bda30

Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Eggs are kinda unsued and i would have prefer them in another PR that include them fully but okay.

@FoxxoTrystan FoxxoTrystan added Priority: 2-Medium Needs to be resolved at some point and removed Status: Needs Review Someone please review this labels Aug 24, 2024
@FoxxoTrystan FoxxoTrystan merged commit 6b67a56 into Fansana:master Aug 24, 2024
12 of 13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants