Skip to content
This repository has been archived by the owner on Dec 30, 2024. It is now read-only.

More Pets! #151

Draft
wants to merge 29 commits into
base: master
Choose a base branch
from
Draft

More Pets! #151

wants to merge 29 commits into from

Conversation

SomeCabbage
Copy link
Contributor

@SomeCabbage SomeCabbage commented May 22, 2023

Description

As you would expect this adds in some more pets.

TODO

  • McG
  • Baby Fox
  • Jack Parker (monkey lawyer)
  • balance Jack and make his loadout work (somehow)
  • Problems the cat
  • give problems a wire munching ai
  • give problems shock immunity
  • Wilson the musical fox
  • give wilson an inherent musical instrument
  • Shiro the slimecat
  • Balance Shiro
  • Proper inventory for Shiro
  • Proper meat from butchering
  • Redo Shiro's sprite
  • Make Shiro based off a basic slimecat prototype
  • Figure out how the slime texture filters work
  • Pete the cactus
  • Pete the cactus (weapon form)
  • Gonk droid
  • Brick (sentient brick)
  • accursed ventbull
  • Hughes the prison guarding gorilla
  • Give Hughes a unique appearance
  • Spawners for all of them
  • Adding some of them to variable spawners to sometimes replace existing pets

Media

uh no media yet

Changelog

🆑 SomeCabbage

  • add: fun pets
    (make changelog better when more progress is made)

@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 May 22, 2023
@github-actions
Copy link

github-actions bot commented May 22, 2023

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

Resources/Textures/Clothing/Mask/breath.rsi

State Old New Status
equipped-MASK-shiro Added

Resources/Textures/Objects/Tanks/anesthetic.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/Objects/Tanks/emergency.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/Objects/Tanks/emergency_double.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/Objects/Tanks/emergency_yellow.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/Objects/Tanks/generic.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/Objects/Tanks/oxygen.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/Objects/Tanks/red.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/Objects/Tanks/yellow.rsi

State Old New Status
equipped-SUITSTORAGE-shiro Added

Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi

State Old New Status
equipped-BELT-shiro Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi

State Old New Status
baby_fox Added
baby_fox_dead Added
wilson Added
wilson_dead Added

Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi

State Old New Status
crawling Added
dead Added

Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi

State Old New Status
dead Added
monkey Added

Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi

State Old New Status
mcgriff Added
mcgriff_dead Added

Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi

State Old New Status
cat Added
cat_dead Added

Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi

State Old New Status
shiro Added
shiro_dead Added

Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi

State Old New Status
shiro Added

Edit: diff updated after fe33e93

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 9, 2023
@github-actions
Copy link

github-actions bot commented Jun 9, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Changes: Localization Changes any ftl files and removed Status: Merge Conflict FIX YOUR PR AAAGH Changes: Localization Changes any ftl files labels Jun 9, 2023
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 23, 2023
@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 29, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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.

1 participant