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

Spicy Update #2169

Merged
merged 4 commits into from
Oct 29, 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
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ reagent-desc-french-75 = Не только блюспейс артиллерия
reagent-name-eggnog = гоголь-моголь
reagent-desc-eggnog = Взять сыру яичку и кокнуть в кружку, покрошить хлеба, посолить и взболтать.
reagent-name-champagnesponsor = элитное шампанское
reagent-desc-champagnesponsor = Элитный вид шампанского.
reagent-desc-champagnesponsor = Элитный вид шампанского.
reagent-name-ReaperSauce = соус "Тёмный жнец"
reagent-desc-ReaperSauce = Этот соус оправдывает своё название. Используйте в блюдах на свой страх и риск.
16 changes: 16 additions & 0 deletions Resources/Locale/ru-RU/ss220/spicyupd.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ent-SpicyPizzaSynd = острая мясная пицца
.desc = Кажется, на эту вылили целую бутыль острого соуса. Тем не менее, выглядит очень аппетитно.
.suffix = СиндиЛут
ent-ThrowingSliceSynd = кусок острой мясной пиццы
.desc = Кусок пиццы, покрытый острым соусом.
.suffix = СиндиЛут
ent-SpicyPizzaFood = острая мясная пицца
.desc = Кажется, на эту вылили целую бутыль острого соуса. Тем не менее, выглядит очень аппетитно.
ent-ThrowingSliceFood = кусок острой мясной пиццы
.desc = Кусок пиццы, покрытый острым соусом.
ent-FoodBoxPizzaFilledSpicy = коробка пиццы
.suffix = СиндиЛут
.desc = { ent-FoodBoxPizza.desc }

uplink-spicypizza-name = Острая осколочная пицца
uplink-spicypizza-desc = Эта пицца настолько острая, что при падении разлетается на слайсы, калечащие любого, кому не повезло попасть под линию огня. Даже не вздумайте употреблять её в пищу.
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,5 @@
- FoodBurgerCrazy
- FoodPizzaArnoldSlice
- FoodPizzaUraniumSlice
- SpicyPizzaFood #SS220spicyUPD
rareChance: 0.05
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,12 @@
- id: FoodPizzaCotton
prob: 0.10
orGroup: Pizza
#SS220 SpicyUPD begin
- id: SpicyPizzaFood
prob: 0.05
orGroup: Pizza
- id: KnifePlastic
#SS220 SpicyUPD end

# Nugget

Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,27 @@
components:
- SurplusBundle

#SS220 SpicyUPD begin
- type: listing
id: UplinkSpicyPizza
name: uplink-spicypizza-name
description: uplink-spicypizza-desc
icon: { sprite: /Textures/Objects/Consumable/Food/Baked/pizza.rsi, state: spicy }
productEntity: FoodBoxPizzaFilledSpicy
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 3
categories:
- UplinkWeaponry
- UplinkJob
conditions:
- !type:BuyerJobCondition
whitelist:
- Chef
#SS220 SpicyUPD end

#- type: listing
# id: UplinkCQC
# name: ent-cqc-name
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
- type: entity
parent: [BaseItem]
id: SpicyPizzaSynd
name: spicy meat pizza
description: It seems that a whole bottle was poured on this one. Nevertheless, it looks very appetizing.
suffix: SyndieLoot
components:
- type: FlavorProfile
flavors:
- punishment
- savory
- type: Food
- type: SliceableFood
count: 10
slice: ThrowingSliceSynd
- type: SolutionContainerManager
solutions:
food:
maxVol: 50
reagents:
- ReagentId: ReaperSauce
Quantity: 5
- ReagentId: Razorium
Quantity: 20
- ReagentId: Phlogiston
Quantity: 25
- type: EmitSoundOnLand
sound:
path: /Audio/SS220/Effects/Drop/clusterbangbanana.ogg
params:
volume: 2
- type: Sprite
sprite: Objects/Consumable/Food/Baked/pizza.rsi
layers:
- state: spicy
- type: Appearance
- type: ClusterGrenade
fillPrototype: ThrowingSliceSynd
maxGrenadesCount: 10
baseTriggerDelay: 10
distance: 8
velocity: 7
- type: Item
size: Normal
shape:
- 0,0,2,1
- type: DamageOnLand
damage:
types:
Blunt: 10
- type: LandAtCursor
- type: Damageable
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 10
behaviors:
- !type:TriggerBehavior
- !type:DoActsBehavior
acts: ["Destruction"]
- type: ContainerContainer
containers:
cluster-payload: !type:Container
- type: Tag
tags:
- Pizza
- ReptilianFood
- Grenade

- type: entity
id: ThrowingSliceSynd
name: a piece of spicy meat pizza
description: A slice of pizza covered with hot sauce.
suffix: SyndieLoot
parent: [BaseKnife]
components:
- type: FlavorProfile
flavors:
- punishment
- savory
- type: Food
- type: EmitSoundOnLand
sound:
path: /Audio/SS220/Effects/Drop/shiv.ogg
params:
volume: 2
- type: ThrowingAngle
angle: 270
- type: SolutionContainerManager
solutions:
food:
maxVol: 5
reagents:
- ReagentId: Razorium
Quantity: 2.5
- ReagentId: Phlogiston
Quantity: 2.5
melee:
maxVol: 3
reagents:
- ReagentId: Phlogiston
Quantity: 3
- type: MeleeChemicalInjector
solution: melee
transferAmount: 3
- type: InjectableSolution
solution: melee
- type: SolutionInjectOnEmbed
transferAmount: 3
solution: melee
- type: SolutionTransfer
maxTransferAmount: 3
- type: UseDelay
- type: Appearance
- type: SolutionContainerVisuals
- type: MeleeWeapon
wideAnimationRotation: 0
attackRate: 2
damage:
types:
Piercing: 2
- type: Tag
tags:
- CombatKnife
- Knife
- type: Sprite
sprite: Objects/Consumable/Food/Baked/pizza.rsi
state: spicy-slice
- type: EmbeddableProjectile
sound: /Audio/Weapons/star_hit.ogg
- type: LandAtCursor
- type: DamageOtherOnHit
ignoreResistances: true
damage:
types:
Piercing: 9
- type: Item
sprite: Objects/Consumable/Food/Baked/pizza.rsi

- type: entity
parent: [BaseItem]
id: SpicyPizzaFood
name: spicy meat pizza
description: It seems that a whole bottle was poured on this one. Nevertheless, it looks very appetizing.
components:
- type: FlavorProfile
flavors:
- spicy
- truenature
- type: Food
- type: SliceableFood
count: 10
slice: ThrowingSliceFood
- type: SolutionContainerManager
solutions:
food:
maxVol: 50
reagents:
- ReagentId: Nutriment
Quantity: 25
- ReagentId: ReaperSauce
Quantity: 20
- ReagentId: Vitamin
Quantity: 5
- type: Sprite
sprite: Objects/Consumable/Food/Baked/pizza.rsi
layers:
- state: spicy
- type: Appearance
- type: ClusterGrenade
fillPrototype: ThrowingSliceFood
maxGrenadesCount: 10
baseTriggerDelay: 10
distance: 4
velocity: 3
- type: Item
size: Normal
shape:
- 0,0,2,1
- type: DamageOnLand
damage:
types:
Blunt: 1
- type: LandAtCursor
- type: Damageable
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1
behaviors:
- !type:TriggerBehavior
- !type:DoActsBehavior
acts: ["Destruction"]
- type: ContainerContainer
containers:
cluster-payload: !type:Container
- type: Tag
tags:
- Pizza
- ReptilianFood
- Grenade

- type: entity
id: ThrowingSliceFood
name: a piece of spicy meat pizza
description: A slice of pizza covered with hot sauce.
parent: [BaseKnife]
components:
- type: FlavorProfile
flavors:
- spicy
- truenature
- type: Food
- type: EmitSoundOnLand
sound:
path: /Audio/SS220/Effects/Drop/shiv.ogg
params:
volume: 2
- type: ThrowingAngle
angle: 270
- type: SolutionContainerManager
solutions:
food:
maxVol: 5
reagents:
- ReagentId: Nutriment
Quantity: 2.5
- ReagentId: ReaperSauce
Quantity: 2
- ReagentId: Vitamin
Quantity: 0.5
melee:
maxVol: 10
reagents:
- ReagentId: CapsaicinOil
Quantity: 5
- type: MeleeChemicalInjector
solution: melee
transferAmount: 5
- type: InjectableSolution
solution: melee
- type: SolutionInjectOnEmbed
transferAmount: 5
solution: melee
- type: SolutionTransfer
maxTransferAmount: 5
- type: UseDelay
- type: Appearance
- type: SolutionContainerVisuals
- type: Tag
tags:
- CombatKnife
- Knife
- Slice
- Pizza
- ReptilianFood
- type: Sprite
sprite: Objects/Consumable/Food/Baked/pizza.rsi
state: spicy-slice
- type: EmbeddableProjectile
sound: /Audio/Weapons/star_hit.ogg
- type: LandAtCursor
- type: Item
sprite: Objects/Consumable/Food/Baked/pizza.rsi

- type: entity
id: FoodBoxPizzaFilledSpicy
name: pizza box
suffix: SyndieLoot
parent: FoodBoxPizza
components:
- type: Sprite
layers:
- state: box
- state: box-open
map: ["enum.StorageVisualLayers.Door"]
- type: StorageFill
contents:
- id: SpicyPizzaSynd
- id: KnifePlastic
Loading
Loading