Skip to content

Commit

Permalink
added problems
Browse files Browse the repository at this point in the history
  • Loading branch information
SomeCabbage committed Jun 12, 2023
1 parent aae0af2 commit 090fa77
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
Alive:
Base: shiro
Critical:
Base: shiro
Base: shiro_dead
Dead:
Base: shiro_dead
- type: Butcherable
Expand Down
55 changes: 44 additions & 11 deletions Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
reagent:
solutionName: chemicals
reagent: ShirosDelight
unitsPerUpdate: 3.0
accumulatorTime: 4.0
unitsPerUpdate: 1.0
accumulatorTime: 5.0
- type: SolutionContainerManager
solutions:
melee:
Expand All @@ -128,11 +128,12 @@
- type: MeleeChemicalInjector
solution: melee
transferAmount: 2.0
- type: AutoRegenReagent
- type: SolutionRegeneration
solution: melee
unitsPerSecond: 0.5
reagents:
- Desoxyephedrine
generated:
reagents:
- ReagentId: Desoxyephedrine
Quantity: 0.5
- type: MeleeWeapon
animation: WeaponArcClaw
attackRate: 2
Expand Down Expand Up @@ -168,6 +169,34 @@
- type: Loadout
prototypes: [ ShirosVest ]

- type: entity
name: Problems
id: MobCatProblems
parent: MobCat
description: Defender of the medbay... from mice anyway.
components:
- type: Sprite
drawdepth: Mobs
sprite: SimpleStation14/Mobs/Pets/problems.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: cat
- type: Appearance
- type: DamageStateVisuals
states:
Alive:
Base: cat
Critical:
Base: cat_dead
Dead:
Base: cat_dead
- type: Tag
tags:
- CannotSuicide
- type: Grammar
attributes:
gender: neuter

- type: entity
name: Jack Parker
id: MobMonkeyJackParker
Expand Down Expand Up @@ -263,7 +292,7 @@
prototypes: [ JacksThings ]

- type: entity
name: gorilla
name: Hughes
parent: MobMonkey
id: MobGorillaHughes
description: Don't sign up for human testin bud.
Expand Down Expand Up @@ -339,7 +368,7 @@
barks:
- Grunt.
- type: Loadout
prototypes: []
prototypes: [ HughesThings ]


- type: startingGear
Expand All @@ -349,6 +378,10 @@

- type: startingGear
id: JacksThings
equipment:
inhand:
right hand: BriefcaseBrownFilled
inhand:
right hand: BriefcaseBrownFilled

- type: startingGear
id: HughesThings
inhand:
right hand: FoodBanana
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
- type: inventoryTemplate
id: shiro
slots:
- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,1
strippingWindowPos: 1,1
displayName: Mask
whitelist:
tags:
- PetWearable
- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,1
strippingWindowPos: 1,1
displayName: Mask
whitelist:
tags:
- PetWearable

- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
slotGroup: SecondHotbar
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,5
displayName: Suit Storage
whitelist:
components:
- GasTank
- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
slotGroup: SecondHotbar
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,5
displayName: Suit Storage
whitelist:
components:
- GasTank

- name: belt
slotTexture: belt
slotFlags: BELT
slotGroup: SecondHotbar
stripTime: 3
uiWindowPos: 3,1
strippingWindowPos: 1,5
displayName: Belt
whitelist:
tags:
- PetWearable
- name: belt
slotTexture: belt
slotFlags: BELT
slotGroup: SecondHotbar
stripTime: 3
uiWindowPos: 3,1
strippingWindowPos: 1,5
displayName: Belt
whitelist:
tags:
- PetWearable
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "",
"states": [
{
"name": "cat",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cat_dead",
"delays": [
[
1
]
]
}
]
}

0 comments on commit 090fa77

Please sign in to comment.