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

Add the ability to put hats on medibots #28584

Merged
merged 4 commits into from
Jun 23, 2024
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
@@ -1,5 +1,5 @@
- type: entity
parent: BaseMob
parent: [BaseMob, StripableInventoryBase]
id: BaseBorgChassis
name: cyborg
description: A man-machine hybrid that assists in station activity. They love being asked to state their laws over and over.
Expand Down Expand Up @@ -77,8 +77,6 @@
- type: SiliconLawProvider
laws: Crewsimov
- type: IonStormTarget
- type: Strippable
- type: InventorySlots
- type: Inventory
templateId: borg
- type: Hands
Expand Down
100 changes: 15 additions & 85 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,10 @@

- type: entity
name: kangaroo
parent: [ SimpleMobBase, MobCombat ]
parent:
- SimpleMobBase
- MobCombat
- StripableInventoryBase
id: MobKangaroo
description: A large marsupial herbivore. It has powerful hind legs, with nails that resemble long claws.
components:
Expand Down Expand Up @@ -1078,15 +1081,9 @@
templateId: kangaroo
- type: ReplacementAccent
accent: kangaroo
- type: InventorySlots
- type: Strippable
- type: Butcherable
spawned:
- id: FoodMeat
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -1149,15 +1146,14 @@
- type: entity
name: genetic ancestor
id: MobBaseAncestor
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
description: The genetic bipedal ancestor of... Uh... Something. Yeah, there's definitely something on the station that descended from whatever this is.
abstract: true
components:
- type: CombatMode
- type: Inventory
templateId: monkey
speciesId: monkey
- type: InventorySlots
- type: Deathgasp
prototype: MonkeyDeathgasp
- type: Cuffable
Expand All @@ -1176,11 +1172,6 @@
layer:
- MobLayer
- type: Stripping
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: Sprite
drawdepth: Mobs
layers:
Expand Down Expand Up @@ -2370,7 +2361,7 @@

- type: entity
name: possum
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobPossum
description: '"O Possum! My Possum!" -- Walt Whitman, 1865'
components:
Expand All @@ -2395,12 +2386,6 @@
- type: Inventory
speciesId: possum
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -2445,7 +2430,7 @@

- type: entity
name: raccoon
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobRaccoon
description: Trash panda!
components:
Expand All @@ -2470,12 +2455,6 @@
- type: Inventory
speciesId: possum #close enough
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand All @@ -2502,7 +2481,7 @@

- type: entity
name: fox
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobFox
description: They're a fox.
components:
Expand Down Expand Up @@ -2534,12 +2513,6 @@
- type: Inventory
speciesId: fox
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -2584,7 +2557,7 @@

- type: entity
name: corgi
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobCorgi
description: Finally, a space corgi!
components:
Expand All @@ -2611,12 +2584,6 @@
- type: Inventory
speciesId: dog
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -2720,7 +2687,6 @@
- type: Inventory
speciesId: puppy
templateId: pet
- type: InventorySlots
- type: DamageStateVisuals
states:
Alive:
Expand All @@ -2735,7 +2701,7 @@

- type: entity
name: cat
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobCat
description: Feline pet, very funny.
components:
Expand All @@ -2760,12 +2726,6 @@
- type: Inventory
speciesId: cat
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -2957,7 +2917,7 @@

- type: entity
name: sloth
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobSloth
description: Very slow animal. For people with low energy.
components:
Expand Down Expand Up @@ -2985,12 +2945,6 @@
- type: Inventory
speciesId: sloth
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand All @@ -3017,7 +2971,7 @@

- type: entity
name: ferret
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobFerret
description: Just a silly little guy!
components:
Expand All @@ -3042,12 +2996,6 @@
- type: Inventory
speciesId: fox #close enough
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -3075,7 +3023,7 @@

- type: entity
name: hamster
parent: [ SimpleMobBase, MobCombat ]
parent: [ SimpleMobBase, MobCombat, StripableInventoryBase]
id: MobHamster
description: A cute, fluffy, robust hamster.
components:
Expand Down Expand Up @@ -3138,12 +3086,6 @@
- type: Inventory
speciesId: hamster
templateId: hamster
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -3219,7 +3161,7 @@

- type: entity
name: pig
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobPig
description: Oink.
components:
Expand Down Expand Up @@ -3255,12 +3197,6 @@
offspring:
- id: MobPig
- type: ReproductivePartner
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -3291,7 +3227,7 @@

- type: entity
name: diona nymph
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobDionaNymph
description: It's like a cat, only.... branch-ier.
components:
Expand All @@ -3316,15 +3252,9 @@
- type: Inventory
speciesId: cat
templateId: pet
- type: InventorySlots
- type: Strippable
- type: Bloodstream
bloodReagent: Sap
bloodMaxVolume: 60
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down
24 changes: 3 additions & 21 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@

- type: entity
name: Bingus
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobBingus
description: Bingus my beloved...
components:
Expand All @@ -207,12 +207,6 @@
- type: Inventory
speciesId: cat
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -245,7 +239,7 @@

- type: entity
name: McGriff
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobMcGriff
description: This dog can tell something smells around here, and that something is CRIME!
components:
Expand All @@ -270,12 +264,6 @@
- type: Inventory
speciesId: puppy
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down Expand Up @@ -344,7 +332,7 @@

- type: entity
name: Walter
parent: SimpleMobBase
parent: [SimpleMobBase, StripableInventoryBase]
id: MobWalter
description: He likes chems and treats. Walter.
components:
Expand All @@ -369,12 +357,6 @@
- type: Inventory
speciesId: dog
templateId: pet
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: DamageStateVisuals
states:
Alive:
Expand Down
Loading
Loading