Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ petting-failure-sloth = You reach out to pet {THE($target)}, but {SUBJECT($targe
petting-failure-holo = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} spikes almost impale your hand!
petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you decide you'd rather not be toasty carp food.
petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to bite your finger and only your quick reflexes save you from an almost fatal injury.
petting-failure-pibble = You reach out to pet {THE($target)}, and {SUBJECT($target)} lunges at you!
petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} growls, making you think twice.
petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost bites your fingers!
petting-failure-nymph = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} moves their branches away.
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@
category: cargoproduct-category-name-livestock
group: market

- type: cargoProduct
id: LivestockPibble
icon:
sprite: Mobs/Pets/pitbull.rsi
state: pibble
product: CrateNPCPibble
cost: 700
category: Livestock
group: market

- type: cargoProduct
id: LivestockCorgi
icon:
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/npc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@
- id: MobDuckWhite
amount: 2

- type: entity
id: CrateNPCPibble
parent: CrateLivestock
name: pitbull crate
description: "Note from the shelter: Lab mix. Looking for a home without cats, birds, or children. Anxious when pet."
components:
- type: StorageFill
contents:
- id: MobPibble
amount: 1

- type: entity
id: CrateNPCCorgi
parent: CrateLivestock
Expand Down
40 changes: 40 additions & 0 deletions Resources/Prototypes/Datasets/Names/pitbull.yml
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 :)

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
- type: dataset
id: names_pitbull
values:
- Amon
- Arioch
- Baby
- Blaze
- Blue
- Bubbles
- Buttercup
- Cuddles
- Cujo
- Daffodil
- Daisy
- Dante
- Demon
- Diesel
- Echo
- Face Eater
- Franny
- Hades
- Killer
- Lady
- Lucifer
- Luna
- Magnum
- Mammon
- Midas
- Paisley
- Peaches
- Petunia
- Princess
- Rainbow
- Reaper
- Satan
- Sweetie
- Trixie
- Trogdor
- Tutu
- Zeus
129 changes: 129 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
- 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

parent: SimpleMobBase
id: MobPibble
name: pitbull
description: Nanny dog. Or a lab mix depending on who is asking.
components:
- type: MeleeWeapon
hidden: true
soundHit:
path: /Audio/Effects/bite.ogg
angle: 0
animation: WeaponArcBite
damage:
types:
Slash: 4
Piercing: 8
Blunt: 1
Structural: 4
- type: MobState
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Pets/pitbull.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: pibble
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 135 #Bigger than Laika
mask:
- MobMask
layer:
- MobLayer
- type: Appearance
- type: Inventory
speciesId: dog
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Base: pibble
Critical:
Base: pibble_dead
Dead:
Base: pibble_dead
- type: Butcherable
spawned:
- id: FoodMeat
amount: 3
- type: ReplacementAccent
accent: dog
- type: InteractionPopup
successChance: 0.7
interactSuccessString: petting-success-dog
interactFailureString: petting-failure-pibble
interactSuccessSound:
path: /Audio/Animals/small_dog_bark_happy.ogg
hostileOnFail: true
- type: DogVision
- type: NpcFactionMember
factions:
- Pibble
- type: HTN
rootTask:
task: SimpleHostileCompound
blackboard:
NavSmash: !type:Bool
true
- type: Grammar
attributes:
proper: true
- type: RandomMetadata
nameSegments: [names_pitbull]
- type: Speech
speechVerb: Canine
speechSounds: Vulpkanin
- type: LanguageKnowledge
speaks:
- Dog
understands:
- Dog
- GalacticCommon

- type: entity
parent: MobPibble
id: MobPibbleVent
name: ventbull
description: Some kind of pitbull mix... or maybe the next stage in pibble evolution?
components:
- type: MeleeWeapon
hidden: true
soundHit:
path: /Audio/Effects/bite.ogg
angle: 0
animation: WeaponArcBite
damage:
types:
Slash: 2
Piercing: 5
Blunt: 0.5
Structural: 2
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.28
density: 135
mask:
- SmallMobMask
layer:
- SmallMobLayer
- type: Sprite
scale: 0.8, 0.6
drawdepth: Mobs
sprite: Mobs/Pets/ventbull.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: pibble
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/Player/harpy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
- type: NpcFactionMember
factions:
- NanoTrasen
- Birb
2 changes: 2 additions & 0 deletions Resources/Prototypes/GameRules/events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@
prob: 0.02
- id: MobMouse2
prob: 0.02
- id: MobPibbleVent
prob: 0.005

- type: entity
id: PowerGridCheck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
sprite: Nyanotrasen/Clothing/Uniforms/Jumpsuit/mailman.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Uniforms/Jumpsuit/mailman.rsi
# - type: ClothingAddFaction
# faction: Mailman
- type: ClothingAddFaction
faction: Mailman

- type: entity
parent: ClothingUniformSkirtBase
Expand All @@ -21,8 +21,8 @@
sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/mailman.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/mailman.rsi
# - type: ClothingAddFaction
# faction: Mailman
- type: ClothingAddFaction
faction: Mailman

- type: entity
parent: ClothingUniformJumpsuitResearchDirector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,5 @@
- MobFrog
- MobMothroach
- MobArcticFox
- MobPibble
rareChance: 0.15
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@
- type: NpcFactionMember
factions:
- NanoTrasen
- Cat

16 changes: 16 additions & 0 deletions Resources/Prototypes/ai_factions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,19 @@
- Zombie
- SimpleHostile
- Dragon

- type: npcFaction
id: Pibble
hostile:
- Cat
- Birb
- Mailman

- type: npcFaction
id: Mailman

- type: npcFaction
id: Cat

- type: npcFaction
id: Birb
22 changes: 22 additions & 0 deletions Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"size":
{
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Hyenh#6078 (313846233099927552)",
"states":
[
{
"name": "pibble",
"directions": 4
},

{
"name": "pibble_dead",
"directions": 1
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"size":
{
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Hyenh#6078 (313846233099927552)",
"states":
[
{
"name": "pibble",
"directions": 4
},

{
"name": "pibble_dead",
"directions": 1
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.