Skip to content

Commit

Permalink
Fixed an error with amnestics and void creatures
Browse files Browse the repository at this point in the history
  • Loading branch information
Guloveos committed Aug 23, 2024
1 parent d24fb9b commit 0b9042e
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 76 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,9 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als
reagent-name-rubberneck = rubberneck
reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet.
reagent-desc-Base-amnestic = Only the best from the NTPD!
reagent-desc-amnestice = A perfectly normal drink.
reagent-desc-amnesticz = WARNING [DO NOT INJEST] WARNING
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/void.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
critThreshold: 75
- type: Butcherable
spawned:
- id: FoodMeatvoidraw
- id: Foodvoid
amount: 1
- type: Bloodstream
bloodMaxVolume: 100
Expand Down
72 changes: 12 additions & 60 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2149,75 +2149,27 @@
sprite: Objects/Consumable/Food/meat.rsi
state: xenocutlet-cooked

#void

- type: entity
name: raw void?
parent: FoodMeatRawBase
id: FoodMeatvoidraw
description: A slab of the uh... void?
components:
- type: Sprite
state: plain_void
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 9
- ReagentId: Fat
Quantity: 9
- type: InternalTemperature
conductivity: 0.43
- type: Construction
graph: MeatSteakvoid
node: start
defaultTarget: meat steak void
- type: Tag
tags:
- Meat
- type: FoodSequenceElement
sprite:
sprite: Objects/Consumable/Food/meat.rsi
state: plain_void
entries:
burger:
name: food-sequence-burger-content-raw-meat
taco:
name: food-sequence-content-raw-meat

- type: entity
name: cooked void steak
parent: FoodMeatBase
id: FoodMeatCookedvoid
description: A cooked slab of the void?
id: Foodvoid
description: null.
components:
- type: Tag
tags:
- Cooked
- Raw
- Meat
- Steak
- Trash
- Recyclable
- type: Sprite
layers:
- state: plain_cooked_void
state: void
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Protein
Quantity: 5
- type: SliceableFood
count: 3
slice: FoodMeatCutletCooked
- type: Construction
graph: MeatSteakvoid
node: meat steak void
- type: FoodSequenceElement
sprite:
sprite: Objects/Consumable/Food/meat.rsi
state: plain_cooked_void
entries:
burger:
name: food-sequence-burger-content-meat
- ReagentId: amnesticz
Quantity: 1
- ReagentId: GastroToxin
Quantity: 4
- ReagentId: Fat
Quantity: 4
22 changes: 11 additions & 11 deletions Resources/Prototypes/Reagents/Consumable/Drink/amnestics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
id: amnestica
name: class A amnestic
parent: Baseamnestic
desc: crappy
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatastea
color: "#7ae645"
Expand All @@ -53,7 +53,7 @@
id: amnesticb
name: class B amnestic
parent: Baseamnestic
desc: really crappy
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatasteb
color: "#7a282e"
Expand All @@ -78,7 +78,7 @@
id: amnesticd
name: class D amnestic
parent: Baseamnestic
desc: shit
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatasted
color: "#355442"
Expand All @@ -103,7 +103,7 @@
id: amnestice
name: class E amnestic
parent: Baseamnestic
desc: fine
desc: reagent-desc-amnestice
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatastee
color: "#b0a400"
Expand All @@ -128,7 +128,7 @@
id: amnesticg
name: class G amnestic
parent: Baseamnestic
desc: dream like
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatasteg
color: "#ffa47a"
Expand All @@ -153,7 +153,7 @@
id: amnestich
name: class H amnestic
parent: Baseamnestic
desc: bland
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatasteh
color: "#1e2594"
Expand All @@ -178,7 +178,7 @@
id: amnestici
name: class I amnestic
parent: Baseamnestic
desc: salty
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatastei
color: "#15241b"
Expand All @@ -203,7 +203,7 @@
id: amnesticw
name: class W amnestic
parent: Baseamnestic
desc: clear?
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatastew
color: "#66495e"
Expand All @@ -228,7 +228,7 @@
id: amnesticx
name: class X amnestic
parent: Baseamnestic
desc: tangy
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatastex
color: "#97b08f"
Expand All @@ -253,7 +253,7 @@
id: amnesticy
name: class Y amnestic
parent: Baseamnestic
desc: amazing
desc: reagent-desc-Base-amnestic
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatastey
color: "#1a0307"
Expand All @@ -278,7 +278,7 @@
id: amnesticz
name: class Z amnestic
parent: Baseamnestic
desc: everything
desc: reagent-desc-amnesticz
physicalDesc: reagent-physical-desc-strong-smelling
flavor: amnesticatastez
color: "#300061"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,7 @@
"name": "rouny"
},
{
"name": "plain_void"
},
{
"name": "plain_cooked_void"
"name": "void"
},
{
"name": "rouny-cooked"
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0b9042e

Please sign in to comment.