Фиксы говна пупика

Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

@@ -39,7 +39,7 @@
     TowercapSeeds: 5
     WheatSeeds: 5
     WatermelonSeeds: 5
-    CoffeeArabicaSeeds: 5
+    CoffeeArabicaSeeds: 5 # Sunrise-Edit
   contrabandInventory:
     TobaccoSeeds: 2
     FoodSnackSemki: 2

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -2593,109 +2593,3 @@
     entries:
       Taco: AnomalyBerry
       Burger: AnomalyBerryBurger
-
-# Sunrise start
-- type: entity
-  name: explosivebanana
-  description: explosivebanana
-  parent: FoodProduceBase
-  id: Explosivebanana
-  components:
-  - type: Damageable
-    damageContainer: Biological
-  - type: DamageOnHighSpeedImpact
-    minimumSpeed: 0.1
-    damage:
-      types:
-        Blunt: 1
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: desecration
-      - !type:SpillBehavior
-        solution: food
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: FlavorProfile
-    flavors:
-    - strange
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/Explosivebanana.rsi
-    state: produce
-  - type: Produce
-    seedId: ExplosiveBanana
-  - type: SolutionContainerManager
-    solutions:
-      beaker:
-        maxVol: 40
-        canReact: false
-      food:
-        maxVol: 5
-        canReact: false
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 2
-        - ReagentId: Potassium
-          Quantity: 1
-        - ReagentId: Water
-          Quantity: 1
-  - type: Tag
-    tags:
-    - Fruit
-
-- type: entity
-  name: coffe arabica
-  description: A coffe arabica grains, main food of scientist.
-  parent: FoodProduceBase
-  id: FoodCoffeeArabica
-  components:
-  - type: FlavorProfile
-    flavors:
-    - strange
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/coffeearabica.rsi
-    state: produce
-  - type: Produce
-    seedId: CoffeeArabica
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: Grcoffee
-          Quantity: 1
-  - type: Tag
-    tags:
-    - Fruit
-
-- type: entity
-  name: coffe robast
-  description: A coffe robast grains, main food of shutcurity.
-  parent: FoodProduceBase
-  id: FoodCoffeeRobast
-  components:
-  - type: FlavorProfile
-    flavors:
-    - strange
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/coffeerobast.rsi
-    state: produce
-  - type: Produce
-    seedId: CoffeeRobast
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Grcoffee
-          Quantity: 2
-        - ReagentId: Ephedrine
-          Quantity: 1
-  - type: Tag
-    tags:
-    - Fruit

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -761,34 +761,3 @@
       seedId: anomalyBerry
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
-
-# Sunrise start
-- type: entity
-  parent: SeedBase
-  name: packet of explosive banana
-  id: ExplosivebananaSeeds
-  components:
-  - type: Seed
-    seedId: ExplosiveBanana
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/explosivebanana.rsi
-
-- type: entity
-  parent: SeedBase
-  name: packet of coffee arabica
-  id: CoffeeArabicaSeeds
-  components:
-  - type: Seed
-    seedId: CoffeeArabica
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/coffeearabica.rsi
-
-- type: entity
-  parent: SeedBase
-  name: packet of coffee robast
-  id: CoffeeRobastSeeds
-  components:
-  - type: Seed
-    seedId: CoffeeRobast
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/coffeerobast.rsi

Resources/Prototypes/Hydroponics/seeds.yml

@@ -1990,101 +1990,3 @@
       Min: 1
       Max: 2
       PotencyDivisor: 40
-
-# Sunrise start
-- type: seed
-  id: ExplosiveBanana
-  name: seeds-explosivebanana-name
-  noun: seeds-noun-seeds
-  displayName: seeds-explosivebanana-display-name
-  plantRsi: Objects/Specific/Hydroponics/explosivebanana.rsi
-  packetPrototype: ExplosivebananaSeeds
-  productPrototypes:
-  - Explosivebanana
-  lifespan: 25
-  maturation: 12
-  production: 2
-  yield: 2
-  potency: 10
-  growthStages: 6
-  waterConsumption: 0.60
-  nutrientConsumption: 0.50
-  chemicals:
-    Potassium:
-      Min: 1
-      Max: 15
-      PotencyDivisor: 4
-    Nutriment:
-      Min: 1
-      Max: 2
-      PotencyDivisor: 30
-    Water:
-      Min: 1
-      Max: 15
-      PotencyDivisor: 4
-
-- type: seed
-  id: CoffeeArabica
-  name: seeds-coffeearabica-name
-  noun: seeds-noun-seeds
-  displayName: seeds-coffeearabica-display-name
-  plantRsi: Objects/Specific/Hydroponics/coffeearabica.rsi
-  packetPrototype: CoffeeArabicaSeeds
-  productPrototypes:
-  - FoodCoffeeArabica
-  harvestRepeat: Repeat
-  mutationPrototypes:
-  - CoffeeRobast
-  lifespan: 25
-  maturation: 6
-  production: 4
-  yield: 3
-  potency: 10
-  growthStages: 5
-  idealLight: 7
-  waterConsumption: 0.40
-  nutrientConsumption: 0.30
-  idealHeat: 298
-  chemicals:
-    Grcoffee:
-      Min: 1
-      Max: 20
-      PotencyDivisor: 4
-    Nutriment:
-      Min: 1
-      Max: 2
-      PotencyDivisor: 4
-
-- type: seed
-  id: CoffeeRobast
-  name: seeds-coffeerobast-name
-  noun: seeds-noun-seeds
-  displayName: seeds-coffeerobast-display-name
-  plantRsi: Objects/Specific/Hydroponics/coffeerobast.rsi
-  packetPrototype: CoffeeRobastSeeds
-  productPrototypes:
-  - FoodCoffeeRobast
-  harvestRepeat: Repeat
-  lifespan: 25
-  maturation: 6
-  production: 4
-  yield: 3
-  potency: 10
-  growthStages: 5
-  idealLight: 7
-  waterConsumption: 0.40
-  nutrientConsumption: 0.30
-  idealHeat: 298
-  chemicals:
-    Grcoffee:
-      Min: 1
-      Max: 10
-      PotencyDivisor: 2
-    Nutriment:
-      Min: 1
-      Max: 2
-      PotencyDivisor: 2
-    Ephedrine:
-      Min: 1
-      Max: 10
-      PotencyDivisor: 25

Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml

@@ -0,0 +1,104 @@
+- type: entity
+  name: explosivebanana
+  description: explosivebanana
+  parent: FoodProduceBase
+  id: Explosivebanana
+  components:
+  - type: Damageable
+    damageContainer: Biological
+  - type: DamageOnHighSpeedImpact
+    minimumSpeed: 0.1
+    damage:
+      types:
+        Blunt: 1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: desecration
+      - !type:SpillBehavior
+        solution: food
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: FlavorProfile
+    flavors:
+    - strange
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Hydroponics/explosivebanana.rsi
+    state: produce
+  - type: Produce
+    seedId: ExplosiveBanana
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 40
+        canReact: false
+      food:
+        maxVol: 5
+        canReact: false
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Potassium
+          Quantity: 1
+        - ReagentId: Water
+          Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: coffe arabica
+  description: A coffe arabica grains, main food of scientist.
+  parent: FoodProduceBase
+  id: FoodCoffeeArabica
+  components:
+  - type: FlavorProfile
+    flavors:
+    - strange
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Hydroponics/coffeearabica.rsi
+    state: produce
+  - type: Produce
+    seedId: CoffeeArabica
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Grcoffee
+          Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: coffe robast
+  description: A coffe robast grains, main food of shutcurity.
+  parent: FoodProduceBase
+  id: FoodCoffeeRobast
+  components:
+  - type: FlavorProfile
+    flavors:
+    - strange
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Hydroponics/coffeerobast.rsi
+    state: produce
+  - type: Produce
+    seedId: CoffeeRobast
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Grcoffee
+          Quantity: 2
+        - ReagentId: Ephedrine
+          Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit

Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -0,0 +1,29 @@
+- type: entity
+  parent: SeedBase
+  name: packet of explosive banana
+  id: ExplosivebananaSeeds
+  components:
+  - type: Seed
+    seedId: ExplosiveBanana
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Hydroponics/explosivebanana.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of coffee arabica
+  id: CoffeeArabicaSeeds
+  components:
+  - type: Seed
+    seedId: CoffeeArabica
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Hydroponics/coffeearabica.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of coffee robast
+  id: CoffeeRobastSeeds
+  components:
+  - type: Seed
+    seedId: CoffeeRobast
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Hydroponics/coffeerobast.rsi

Resources/Prototypes/_Sunrise/Hydroponics/seeds.yml

@@ -0,0 +1,96 @@
+- type: seed
+  id: ExplosiveBanana
+  name: seeds-explosivebanana-name
+  noun: seeds-noun-seeds
+  displayName: seeds-explosivebanana-display-name
+  plantRsi: _Sunrise/Objects/Specific/Hydroponics/explosivebanana.rsi
+  packetPrototype: ExplosivebananaSeeds
+  productPrototypes:
+  - Explosivebanana
+  lifespan: 25
+  maturation: 12
+  production: 2
+  yield: 2
+  potency: 10
+  growthStages: 6
+  waterConsumption: 0.60
+  nutrientConsumption: 0.50
+  chemicals:
+    Potassium:
+      Min: 1
+      Max: 15
+      PotencyDivisor: 4
+    Nutriment:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 30
+    Water:
+      Min: 1
+      Max: 15
+      PotencyDivisor: 4
+
+- type: seed
+  id: CoffeeArabica
+  name: seeds-coffeearabica-name
+  noun: seeds-noun-seeds
+  displayName: seeds-coffeearabica-display-name
+  plantRsi: _Sunrise/Objects/Specific/Hydroponics/coffeearabica.rsi
+  packetPrototype: CoffeeArabicaSeeds
+  productPrototypes:
+  - FoodCoffeeArabica
+  harvestRepeat: Repeat
+  mutationPrototypes:
+  - CoffeeRobast
+  lifespan: 25
+  maturation: 6
+  production: 4
+  yield: 3
+  potency: 10
+  growthStages: 5
+  idealLight: 7
+  waterConsumption: 0.40
+  nutrientConsumption: 0.30
+  idealHeat: 298
+  chemicals:
+    Grcoffee:
+      Min: 1
+      Max: 20
+      PotencyDivisor: 4
+    Nutriment:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 4
+
+- type: seed
+  id: CoffeeRobast
+  name: seeds-coffeerobast-name
+  noun: seeds-noun-seeds
+  displayName: seeds-coffeerobast-display-name
+  plantRsi: _Sunrise/Objects/Specific/Hydroponics/coffeerobast.rsi
+  packetPrototype: CoffeeRobastSeeds
+  productPrototypes:
+  - FoodCoffeeRobast
+  harvestRepeat: Repeat
+  lifespan: 25
+  maturation: 6
+  production: 4
+  yield: 3
+  potency: 10
+  growthStages: 5
+  idealLight: 7
+  waterConsumption: 0.40
+  nutrientConsumption: 0.30
+  idealHeat: 298
+  chemicals:
+    Grcoffee:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 2
+    Nutriment:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 2
+    Ephedrine:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 25

Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/drinks.yml

@@ -9,7 +9,7 @@
   metamorphicSprite:
     sprite: _Sunrise/Objects/Consumable/Drinks/kvass.rsi
     state: icon
-    
+
 - type: reagent
   id: ChamomileTincture
   name: reagent-name-chamomile-tincture
@@ -32,4 +32,26 @@
           types:
             Poison: -2
       - !type:ChemCleanBloodstream
-        cleanseRate: 1
+        cleanseRate: 1
+
+- type: reagent
+  id: Grcoffee
+  name: reagent-name-grcoffee
+  parent: BaseDrink
+  desc: reagent-desc-grcoffee
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: coffee
+  color: "#664300"
+  recognizable: true
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
+      - !type:AdjustReagent
+        reagent: Theobromine
+        amount: 0.05

Resources/Prototypes/_Sunrise/Vaccine/Reagents/grcoffee.yml

@@ -1,21 +0,0 @@
-- type: reagent
-  id: Grcoffee
-  name: reagent-name-grcoffee
-  parent: BaseDrink
-  desc: reagent-desc-grcoffee
-  physicalDesc: reagent-physical-desc-aromatic
-  flavor: coffee
-  color: "#664300"
-  recognizable: true
-  metabolisms:
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 2.0
-        type: Remove
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.05

Resources/Textures/Objects/Specific/Hydroponics/Explosivebanana.rsi/meta.json

@@ -1,84 +0,0 @@
-{
-  "version": 1,
-   "license": "CC-BY-SA-3.0",
-  "copyright": "By Temmie for Sunrise",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "dead"
-    },
-    {
-      "name": "harvest"
-    },
-    {
-      "name": "produce"
-    },
-    {
-      "name": "peel"
-    },
-    {
-      "name": "peel2"
-    },
-    {
-      "name": "peel3"
-    },
-    {
-      "name": "peel-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "peel-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "baked-peel"
-    },
-    {
-      "name": "baked-peel2"
-    },
-    {
-      "name": "baked-peel3"
-    },
-    {
-      "name": "baked-peel-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "baked-peel-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "seed"
-    },
-    {
-      "name": "stage-1"
-    },
-    {
-      "name": "stage-2"
-    },
-    {
-      "name": "stage-3"
-    },
-    {
-      "name": "stage-4"
-    },
-    {
-      "name": "stage-5"
-    },
-    {
-      "name": "stage-6"
-    },
-    {
-      "name": "primed",
-      "delays": [
-        [
-          4.9,
-          0.1
-        ]
-      ]
-    }
-  ]
-}