Fix Butcherable handling, ItemSlots for clown shoes (#25661)
* Fix butcherable handling * ItemSlots for clown shoes * Return if handled * Handle if popup * Whitespace, spoons are metal * Zero damage plastic utensils, blacklist by metal+melee * Hmmm truthy * Plastic knives are knives too, just use that * Delete unused tag * Always true if doAfter * Raw rat meat should be sliceable too
This commit is contained in:
@@ -1 +1 @@
|
||||
clothing-military-boots-sidearm = Sidearm
|
||||
clothing-boots-sidearm = Sidearm
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
- type: ItemSlots
|
||||
slots:
|
||||
item:
|
||||
name: clothing-military-boots-sidearm
|
||||
name: clothing-boots-sidearm
|
||||
whitelist:
|
||||
tags:
|
||||
- Knife
|
||||
|
||||
@@ -9,8 +9,26 @@
|
||||
- type: Clothing
|
||||
sprite: Clothing/Shoes/Specific/chef.rsi
|
||||
|
||||
# stuff common to all clown & jester shoes
|
||||
- type: entity
|
||||
parent: ClothingShoesBaseButcherable
|
||||
abstract: true
|
||||
parent: [ClothingShoesBaseButcherable, ClothingSlotBase]
|
||||
id: ClothingShoesClownBase
|
||||
components:
|
||||
- type: ItemSlots
|
||||
slots:
|
||||
item:
|
||||
name: clothing-boots-sidearm
|
||||
whitelist:
|
||||
tags:
|
||||
- Knife
|
||||
- ToySidearm
|
||||
blacklist:
|
||||
components:
|
||||
- Sharp
|
||||
|
||||
- type: entity
|
||||
parent: ClothingShoesClownBase
|
||||
id: ClothingShoesClown
|
||||
name: clown shoes
|
||||
description: "The prankster's standard-issue clowning shoes. Damn they're huge!"
|
||||
@@ -49,7 +67,7 @@
|
||||
acceleration: 5
|
||||
|
||||
- type: entity
|
||||
parent: ClothingShoesBaseButcherable
|
||||
parent: ClothingShoesClownBase
|
||||
id: ClothingShoesBling
|
||||
name: bling clown shoes
|
||||
description: Made of refined bananium and shined with the pulp of a fresh banana peel. These make a flashy statement.
|
||||
|
||||
@@ -400,6 +400,9 @@
|
||||
Quantity: 3
|
||||
- ReagentId: Fat
|
||||
Quantity: 3
|
||||
- type: SliceableFood
|
||||
count: 3
|
||||
slice: FoodMeatCutlet
|
||||
|
||||
- type: entity
|
||||
name: raw lizard meat
|
||||
|
||||
@@ -893,6 +893,7 @@
|
||||
- type: Tag
|
||||
tags:
|
||||
- Sidearm
|
||||
- ToySidearm
|
||||
- type: Gun
|
||||
selectedMode: SemiAuto
|
||||
availableModes:
|
||||
@@ -925,14 +926,14 @@
|
||||
suffix: Fake
|
||||
description: Looks almost like the real thing! Ages 8 and up.
|
||||
components:
|
||||
- type: RevolverAmmoProvider
|
||||
whitelist:
|
||||
tags:
|
||||
- CartridgeCap
|
||||
- SpeedLoaderCap
|
||||
- CartridgeMagnum
|
||||
- SpeedLoaderMagnum
|
||||
proto: CartridgeMagnumAP
|
||||
- type: RevolverAmmoProvider
|
||||
whitelist:
|
||||
tags:
|
||||
- CartridgeCap
|
||||
- SpeedLoaderCap
|
||||
- CartridgeMagnum
|
||||
- SpeedLoaderMagnum
|
||||
proto: CartridgeMagnumAP
|
||||
|
||||
- type: entity
|
||||
parent: BaseItem
|
||||
|
||||
@@ -7,9 +7,6 @@
|
||||
sprite: Objects/Misc/utensils.rsi
|
||||
- type: Item # TODO add inhand sprites for all utensils
|
||||
sprite: Objects/Misc/utensils.rsi
|
||||
- type: Tag
|
||||
tags:
|
||||
- Metal
|
||||
- type: SpaceGarbage
|
||||
|
||||
- type: entity
|
||||
@@ -23,8 +20,14 @@
|
||||
price: 0
|
||||
- type: Tag
|
||||
tags:
|
||||
- Plastic
|
||||
- Trash
|
||||
- Plastic
|
||||
- Trash
|
||||
- type: MeleeWeapon
|
||||
wideAnimationRotation: 180
|
||||
attackRate: 1.5
|
||||
damage:
|
||||
types:
|
||||
Blunt: 0
|
||||
|
||||
- type: entity
|
||||
parent: UtensilBase
|
||||
@@ -66,6 +69,9 @@
|
||||
name: spoon
|
||||
description: There is no spoon.
|
||||
components:
|
||||
- type: Tag
|
||||
tags:
|
||||
- Metal
|
||||
- type: Sprite
|
||||
state: spoon
|
||||
- type: Item
|
||||
@@ -99,7 +105,7 @@
|
||||
speedModifier: 0.1 # you can try
|
||||
|
||||
- type: entity
|
||||
parent: UtensilBase
|
||||
parent: UtensilBasePlastic
|
||||
id: KnifePlastic
|
||||
name: plastic knife
|
||||
description: That's not a knife. This is a knife.
|
||||
@@ -109,3 +115,8 @@
|
||||
- type: Utensil
|
||||
types:
|
||||
- Knife
|
||||
- type: Tag
|
||||
tags:
|
||||
- Plastic
|
||||
- Trash
|
||||
- Knife
|
||||
|
||||
@@ -1181,6 +1181,9 @@
|
||||
- type: Tag
|
||||
id: Torch
|
||||
|
||||
- type: Tag
|
||||
id: ToySidearm
|
||||
|
||||
- type: Tag
|
||||
id: Trash
|
||||
|
||||
|
||||
Reference in New Issue
Block a user