Skip to content

Return Of The Pibble#789

Merged
VMSolidus merged 7 commits intoSimple-Station:masterfrom
VMSolidus:Rebase-Pitbulls
Aug 27, 2024
Merged

Return Of The Pibble#789
VMSolidus merged 7 commits intoSimple-Station:masterfrom
VMSolidus:Rebase-Pitbulls

Conversation

@VMSolidus
Copy link
Copy Markdown
Member

Description

This PR Rebases one of Nyanotrasen's funniest features: The Pibble.
I mean "Lab Mix", according to the description. Lab Mixes are comically muscular dogs famous for their ability to attack and destroy Felinids, Mailmen, and more recently Harpies. Watch out, there is also a rare variant of Lab-Dachshund Mix, colloquially known as the "Ventbull", which can occasionally be found roaming the station's vents. Please keep your children, Felinids, and Birbs at a safe distance.

Changelog

🆑

  • add: Lab Mixes have been added to the game as a new random animal. Be sure to keep Felinids and Harpies away from them.

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 23, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 23, 2024

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

Resources/Textures/Mobs/Pets/pitbull.rsi

State Old New Status
pibble Added
pibble_dead Added

Resources/Textures/Mobs/Pets/ventbull.rsi

State Old New Status
pibble Added
pibble_dead Added

Edit: diff updated after 1eb9787

@Elijahrane
Copy link
Copy Markdown
Contributor

I had new AI, utility, content etc planned for pibbles in my big ghostie / NPC feature arc if you don't mind holding off a bit

- Reaper
- Peaches
- Cujo
- Cuddles
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Cuddles is in here twice

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Cuddles is a good enough name to be seeded to appear more

@OldDanceJacket
Copy link
Copy Markdown
Contributor

I had new AI, utility, content etc planned for pibbles in my big ghostie / NPC feature arc if you don't mind holding off a bit
small updates like this can go through.

Your planned feature isn't dependent on pibbles, and pibbles aren't dependent on yours, it should be fine to introduce pibbles back

@@ -0,0 +1,120 @@
- type: entity
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Needs a language, especially as a funny pet is a likely target for Cognizine

Copy link
Copy Markdown
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

As long as Walter's not a pitbull

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Alphabetically sort this :)

VMSolidus and others added 2 commits August 26, 2024 17:26
@VMSolidus VMSolidus merged commit 662d33d into Simple-Station:master Aug 27, 2024
SimpleStation14 added a commit that referenced this pull request Aug 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants