Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue…

…r/frontier-station-14 into pr/1159
new-frontiers-14 · Mar 27, 2024 · d7f6d41 · d7f6d41
2 parents 03ce1a6 + 443322c
commit d7f6d41
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
@@ -111,9 +111,6 @@
     Poison:
       effects:
       - !type:HealthChange
-        conditions:
-        - !type:OrganType
-          type: Human
         damage:
           types:
             Poison: 1
@@ -505,12 +502,6 @@
           shouldHave: false
         reagent: Protein
         amount: 0.5
-      - !type:AdjustReagent # Frontier: Goblin
-        conditions: # Frontier: Goblin
-        - !type:OrganType # Frontier: Goblin
-          type: Goblin # Frontier: Goblin
-        reagent: Protein # Frontier: Goblin
-        amount: 0.5 # Frontier: Goblin
 
 - type: reagent
   id: Allicin

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/there_do_be_goblins.txt b/Resources/Prototypes/_NF/Entities/Mobs/there_do_be_goblins.txt