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

More Pets! #151

Draft
wants to merge 29 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7ce40c1
baby fox!
SomeCabbage May 19, 2023
8dead22
Added McG
SomeCabbage May 19, 2023
72d0b33
typo
SomeCabbage May 19, 2023
121a8ad
wrong path
SomeCabbage May 19, 2023
d6330df
jack pakrer and shiro added along with baby fox metadata corrected
SomeCabbage May 22, 2023
746b2e5
slimy head petting heeh
SomeCabbage May 22, 2023
9c9260a
monkey
SomeCabbage May 22, 2023
65b9da7
slimeballs for shiro
SomeCabbage May 23, 2023
f27bbd5
slime textures
SomeCabbage May 23, 2023
7f178d1
added breathing mask and tank sprites for shiro and funny webbing for…
SomeCabbage May 23, 2023
1a65df2
redoing the starting items for the pets
SomeCabbage May 23, 2023
dcf47a8
changing things
SomeCabbage May 23, 2023
3054960
shiro got working and more colors too!
SomeCabbage May 24, 2023
752eab2
restructured shiro into a base and unique entity being the slime cat …
SomeCabbage May 24, 2023
6b43c60
forgot to remove the image
SomeCabbage May 24, 2023
04f8f65
minor changes
SomeCabbage May 28, 2023
377f04a
transleuceny on th slime
SomeCabbage Jun 2, 2023
7fa44e7
added gorilla and more
SomeCabbage Jun 11, 2023
ce04246
added problems
SomeCabbage Jun 12, 2023
37ca252
updated sprites and added a nonaccented cat prototype
SomeCabbage Jun 12, 2023
651c08b
added a combo faction of the cat and pet ones, as well as wilson
SomeCabbage Jun 12, 2023
e2dbbbb
slimeball made to actually contain slime
SomeCabbage Jun 12, 2023
f59ee9d
InventorySlots component that was missing from certain mobs
SomeCabbage Jun 15, 2023
de3a4e3
hughes unique texture
SomeCabbage Jun 19, 2023
df04544
accents brown hughes other things?
SomeCabbage Jun 19, 2023
453faba
hat wearing looks better and lawyer typing indicators
SomeCabbage Jun 29, 2023
10f396e
hchaged offset
SomeCabbage Jun 29, 2023
a409e24
Merge branch 'master' into more-pets
SomeCabbage Jul 29, 2023
fe33e93
merge from master
SomeCabbage Jul 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Resources/Locale/en-US/accent/accents.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ accent-words-mothroach-1 = Squeak!
accent-words-mothroach-2 = Chirp!
accent-words-mothroach-3 = Peep!
accent-words-mothroach-4 = Eeee!

accent-words-mothroach-5 = Eep!

# Kangaroo
Expand All @@ -87,3 +88,27 @@ accent-words-slimes-2 = Blimpuf?
accent-words-slimes-3 = Blump!
accent-words-slimes-4 = Bluuump...
accent-words-slimes-5 = Blabl blump!

## Parkstation
# Slimecat
accent-words-slimecat-1 = Squish.
accent-words-slimecat-2 = Splort.
accent-words-slimecat-3 = Meow!
accent-words-slimecat-4 = Mew!
accent-words-slimecat-5 = Mow.

# Shiro
accent-words-shiro-1 = Shiro.
accent-words-shiro-2 = Shiro!
accent-words-shiro-3 = Meow!
accent-words-shiro-4 = Squish.
accent-words-shiro-5 = Squish!

# problems
accent-words-problems-1 = Meow!
accent-words-problems-2 = Mew.
accent-words-problems-3 = problems.
accent-words-problems-4 = Squish!
accent-words-problems-5 = Gurgle.
accent-words-problems-6 = Merp.
accent-words-problems-7 = uwu.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ petting-success-dragon = Dodging teeth, claws, and flames, you pet {THE($target)
petting-success-hamster = You pet {THE($target)} on {POSS-ADJ($target)} fluffy little head.
petting-success-bear = You reluctantly pet {THE($target)} on {POSS-ADJ($target)} mystical head.
petting-success-slimes = You pet {THE($target)} on {POSS-ADJ($target)} mucous surface.
petting-success-slime = You pet {THE($target)} on {POSS-ADJ($target)} slimy little head.

petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
- type: accent
id: slimecat
fullReplacements:
- accent-words-slimecat-1
- accent-words-slimecat-2
- accent-words-slimecat-3
- accent-words-slimecat-4
- accent-words-slimecat-5

- type: accent
id: shiro
fullReplacements:
- accent-words-shiro-1
- accent-words-shiro-2
- accent-words-shiro-3
- accent-words-shiro-4
- accent-words-shiro-5

- type: accent
id: problems
fullReplacements:
- accent-words-problems-1
- accent-words-problems-2
- accent-words-problems-3
- accent-words-problems-4
- accent-words-problems-5
- accent-words-problems-6
- accent-words-problems-7
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- type: body
id: AnimalSlime
name: "animalslime"
root: torso
slots:
torso:
part: TorsoAnimal
connections:
- legs
organs:
core: SentientSlimeCore
lungs: OrganSlimeLungs
legs:
part: LegsAnimal
connections:
- feet
feet:
part: FeetAnimal
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: entity
id: ClothingBeltWebbingShiroFilled
parent: ClothingBeltWebbingShiro
suffix: Filled
components:
- type: StorageFill
contents:
- id: DrinkRewriter
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltWebbingShiro
name: shiro's webbing
description: A flexible set of webbing worn by little Shiro.
components:
- type: Sprite
sprite: SimpleStation14/Clothing/Belt/shirowebbing.rsi
- type: Clothing
sprite: SimpleStation14/Clothing/Belt/shirowebbing.rsi
- type: Item
size: 15
- type: Storage
capacity: 10
- type: Tag
tags:
- BeltSlotNotBelt
- PetWearable
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: entity
name: dissociative slimeball
parent: FoodMeatBase
id: FoodShiroSlime
description: A perfectly round blob of Shiro's slime.
components:
- type: FlavorProfile
flavors:
- slimy
- type: Sprite
sprite: SimpleStation14/Objects/Consumable/Food/shiro.rsi
netsync: false
state: shiro
- type: Tag
tags:
- Raw
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: ShirosDelight
Quantity: 30
- type: entity
name: slimeball
parent: FoodMeatSlime
id: FoodMeatSlimeWithSlime
description: A gelatinous shaping of slime jelly.
components:
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Slime
Quantity: 30
239 changes: 239 additions & 0 deletions Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
- type: entity
name: baby fox
parent: MobFox
id: MobFoxBaby
description: A little fox! Aww...
components:
- type: Butcherable
spawned:
- id: FoodMeat
amount: 1
- type: Sprite
drawdepth: Mobs
sprite: SimpleStation14/Mobs/Pets/fox.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: baby_fox
- type: Appearance
- type: Inventory
speciesId: fox
templateId: pet
- type: InventorySlots
- type: DamageStateVisuals
states:
Alive:
Base: baby_fox
Critical:
Base: baby_fox_dead
Dead:
Base: baby_fox_dead
- type: Grammar
attributes:
gender: epicene

- type: entity
name: cat
parent: SimpleMobBase
id: MobCatNoAccent
description: Feline pet, very funny.
abstract: true
components:
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Pets/cat.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: cat
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeCircle
radius: 0.35
density: 15
mask:
- MobMask
layer:
- MobLayer
- type: MeleeWeapon
hidden: true
soundHit:
path: /Audio/Effects/bite.ogg
angle: 0
animation: WeaponArcBite
damage:
types:
Slash: 3
Piercing: 5
- type: Appearance
- type: Inventory
speciesId: cat
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Base: cat
Critical:
Base: cat_dead
Dead:
Base: cat_dead
- type: Butcherable
spawned:
- id: FoodMeat
amount: 3
- type: InteractionPopup
successChance: 0.7
interactSuccessString: petting-success-cat
interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/cat_meow.ogg
- type: Grammar
attributes:
gender: epicene
- type: MobPrice
price: 200
- type: Faction
factions:
- PetCat
- type: RandomBark
barkMultiplier: 1.0
barks:
- Meow!
- Mow.
- Meow.
- Mew.
chatlog: False

- type: entity
name: slime cat
parent: SimpleMobBase
id: MobSlimeCat
description: A cute squishy slime cat. Humorous pet.
components:
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:
shiro: Sixteen
- type: Sprite
drawdepth: Mobs
netsync: false
sprite: SimpleStation14/Mobs/pets/shiro.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
sprite: SimpleStation14/Mobs/pets/shiro.rsi
state: shiro
color: "#FF00FF"
alpha: 200
- type: Body
prototype: AnimalSlime
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeCircle
radius: 0.35
density: 50
mask:
- MobMask
layer:
- MobLayer
- type: Appearance
- type: Inventory
speciesId: shiro
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Base: shiro
Critical:
Base: shiro_dead
Dead:
Base: shiro_dead
- type: Butcherable
spawned:
- id: FoodMeatSlimeWithSlime
amount: 3
- type: InteractionPopup
successChance: 1.0
interactSuccessString: petting-success-slime
interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/fox_squeak.ogg
- type: ReplacementAccent
accent: slimecat
- type: Grammar
attributes:
gender: epicene
- type: Damageable
damageContainer: Biological
damageModifierSet: Slime
- type: Bloodstream
bloodReagent: Slime
bloodlossDamage:
types:
Bloodloss:
1
bloodlossHealDamage:
types:
Bloodloss:
-0.25
- type: Barotrauma
damage:
types:
Blunt: 0.45
- type: Reactive
groups:
Flammable: [ Touch ]
Extinguish: [ Touch ]
reactions:
- reagents: [ Water, SpaceCleaner ]
methods: [ Touch ]
effects:
- !type:WashCreamPieReaction
- reagents: [ Water ]
methods: [ Touch ]
effects:
- !type:HealthChange
scaled: true
damage:
types:
Heat: 2
- !type:PopupMessage
type: Local
visualType: Large
messages: [ "slime-hurt-by-water-popup" ]
probability: 0.25
- type: MeleeWeapon
animation: WeaponArcClaw
attackRate: 1.4
damage:
types:
Blunt: 1
Slash: 3
Piercing: 3
- type: Faction
factions:
- PetCat
- type: RandomBark
barkMultiplier: 1.0
barks:
- Squish.
- Splort.
- Meow.
- Mew.
chatlog: False
- type: MovementSpeedModifier
baseWalkSpeed : 8.0
baseSprintSpeed : 4.0
Loading