Пластиковые бутылки (#75)

* nukie planet fixe a unpowered door to dorm (space-wizards#14277)

* Fix rsi sprite access for verbs (space-wizards#14284)

* Automatic changelog update

* Predict entitystorage (space-wizards#14082)

Co-authored-by: metalgearsloth <[email protected]>

* Crayonsystem cleanup (space-wizards#13400)

Co-authored-by: 0x6273 <[email protected]>

* Send changelog to Discord webhook. (space-wizards#14292)

* Automatic changelog update

* Oopsied the workflow file, awesome. (space-wizards#14293)

* Fix GITHUB_REPOSITORY in changelog pusher (space-wizards#14294)

* Sync lava sprites (space-wizards#14059)

* Plastic bottle textures

Textures for small and LARGE plastic bottles and meta.json for them

* Box of Plastic bottles Icon

* Box of Plastic bottles Meta.json

* Box of Plastic bottles Texture

* Box of Plastic bottles texture Meta.json

* Plastic bottles for chemists! Yey! They are here!

Finally THE CORRECT DIFF YEEEEEEAAAAH!

* Plastic bottles for protolathe and Medical TechFab

* Plastic bottles as technology for R&D

* Plastic bottles recipes for protolathe

* Box of bottles as spawn in Chemists' lockers

* Box of bottles as spawn in ChemCrates

* Box of bottles now contains bottles owo

* Cargo ChemCrate 750 -> 900

* Перевод пластиковых бутылок

* Перевод Коробки из под пластиковых бутылок

* Bagel Station Evac Shuttle Lox (space-wizards#14307)

* proto

* mapfile

* posters n shit

* gyroscope oop

* Add cooldown to hypospray (space-wizards#13953)

* added cooldown to hypospray

* moved one of the 'using's over a space

* changed all cooldowns to 0.5 seconds

* resolved suggestions

* minor comment change

* Medical Wall Locker Hotfix (space-wizards#14247)

Co-authored-by: Jeff <[email protected]>

* Automatic changelog update

* NT Evac Raven (space-wizards#14286)

* raven shuttle

* add missing blast door in sec compartment

* name

* extinguishers and emer lights

* Update Raven dock (space-wizards#14311)

* update raven dock

* name

* siofjaosd (space-wizards#14313)

* Fix ContentTileDefinition prototype reloads (space-wizards#14080)

* Automatic changelog update

* Update english locale files

* Translate upstream update

* Cancel in progress mirror job to prevent losing changes on multiple unmirrored commits

* oops

---------

Co-authored-by: Emisse <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: PJBot <[email protected]>
Co-authored-by: Nemanja <[email protected]>
Co-authored-by: Checkraze <[email protected]>
Co-authored-by: 0x6273 <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: Interrobang01 <[email protected]>
Co-authored-by: ChilbroBaggins <[email protected]>
Co-authored-by: Jeff <[email protected]>
Co-authored-by: Scribbles0 <[email protected]>
Co-authored-by: AruMoon <[email protected]>

Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/science.ftl

@@ -1,3 +1,6 @@
 ent-BoxBeaker = коробка мензурок
     .desc = Полная коробка мензурок.
     .suffix = { "" }
+ent-BoxPlasticBottle = коробка бутылок
+    .desc = Полная коробка бутылок.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl

@@ -7,6 +7,12 @@ ent-Beaker = мензурка
 ent-LargeBeaker = большая мензурка
     .desc = Используется для хранения большого количества химикатов и растворов.
     .suffix = { "" }
+ent-LargeBottle = большая бутылка
+    .desc = Используется для хранения большого количества химикатов и растворов.
+    .suffix = { "" }
+ent-SmallBottle = маленькая бутылка
+    .desc = Используется для хранения среднего количества химикатов и растворов.
+    .suffix = { "" }
 ent-CryostasisBeaker = криостазисная мензурка
     .desc = Используется для хранения химикатов и растворов без протекания реакции.
     .suffix = { "" }

Resources/Prototypes/Catalog/Cargo/cargo_medical.yml

@@ -14,7 +14,7 @@
     sprite: Objects/Specific/Chemistry/beaker.rsi
     state: beaker
   product: CrateChemistrySupplies
-  cost: 750
+  cost: 900
   category: Medical
   group: market
 
@@ -76,4 +76,4 @@
   product: CrateEmergencyRadiationKit
   cost: 2500
   category: Medical
-  group: market
+  group: market

Resources/Prototypes/Catalog/Fills/Boxes/science.yml

@@ -14,3 +14,20 @@
     layers:
       - state: box
       - state: beaker
+
+- type: entity
+  name: plastic bottle box
+  parent: BoxCardboard
+  id: BoxPlasticBottle
+  description: A box full of plastic bottles.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SmallBottle
+        amount: 4
+      - id: LargeBottle
+        amount: 2
+  - type: Sprite
+    layers:
+      - state: box
+      - state: bottleplastic

Resources/Prototypes/Catalog/Fills/Crates/medical.yml

@@ -34,6 +34,8 @@
         amount: 1
       - id: BoxBeaker
         amount: 1
+      - id: BoxPlasticBottle
+        amount: 1
       - id: BoxPillCanister
         amount: 1
       - id: Dropper
@@ -135,4 +137,4 @@
   - type: StorageFill
     contents:
       - id: MedkitRadiationFilled
-        amount: 4
+        amount: 4

Resources/Prototypes/Catalog/Fills/Lockers/medical.yml

@@ -86,6 +86,7 @@
     contents:
       - id: BoxSyringe
       - id: BoxBeaker
+      - id: BoxPlasticBottle
       - id: BoxPillCanister
       - id: BoxBottle
       - id: BoxBottle

Resources/Prototypes/Catalog/Research/technologies.yml

@@ -129,6 +129,8 @@
   unlockedRecipes:
   - Beaker
   - LargeBeaker
+  - LargeBottle
+  - SmallBottle
   - CryostasisBeaker
   - Dropper
   - Syringe

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -121,6 +121,88 @@
     fillBaseName: beakerlarge
   - type: StaticPrice
     price: 40
+
+- type: entity
+  name: small bottle
+  parent: BaseBeaker
+  description: Used to contain a moderate amount of chemicals or solutions.
+  id: SmallBottle
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/bottle_small.rsi
+    layers:
+      - state: bottlesmall
+      - state: bottlesmall1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Chemistry/bottle_small.rsi
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 50
+        canMix: true
+  - type: Appearance
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Inflatable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:SpillBehavior
+        solution: beaker
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: bottlesmall
+  - type: StaticPrice
+    price: 30
+
+- type: entity
+  name: large bottle
+  parent: BaseBeaker
+  description: Used to contain a large amount of chemicals or solutions.
+  id: LargeBottle
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/bottle_large.rsi
+    layers:
+      - state: bottlelarge
+      - state: bottlelarge1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Chemistry/bottle_large.rsi
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 100
+        canMix: true
+  - type: Appearance
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Inflatable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 20
+      behaviors:
+      - !type:SpillBehavior
+        solution: beaker
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: bottlelarge
+  - type: StaticPrice
+    price: 40
 
 - type: entity
   name: cryostasis beaker

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -187,6 +187,8 @@
       - Hemostat
       - Beaker
       - LargeBeaker
+      - LargeBottle
+      - SmallBottle
       - CryostasisBeaker
       - ClothingEyesGlassesScience
       - Dropper
@@ -559,6 +561,8 @@
       - Hemostat
       - Beaker
       - LargeBeaker
+      - LargeBottle
+      - SmallBottle
       - CryostasisBeaker
       - ClothingEyesGlassesScience
       - Dropper

Resources/Prototypes/Recipes/Lathes/chemistry.yml

@@ -12,6 +12,20 @@
   materials:
     Glass: 200
 
+- type: latheRecipe
+  id: LargeBottle
+  result: LargeBottle
+  completetime: 2
+  materials:
+    Plastic: 200
+
+- type: latheRecipe
+  id: SmallBottle
+  result: SmallBottle
+  completetime: 2
+  materials:
+    Plastic: 100
+
 - type: latheRecipe
   id: CryostasisBeaker
   result: CryostasisBeaker

Resources/Textures/Objects/Specific/Chemistry/bottle_large.rsi/meta.json

@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bottlelarge"
+        },
+        {
+            "name": "bottlelarge1"
+        },
+        {
+            "name": "bottlelarge2"
+        },
+        {
+            "name": "bottlelarge3"
+        },
+        {
+            "name": "bottlelarge4"
+        },
+        {
+            "name": "bottlelarge5"
+        },
+        {
+            "name": "bottlelarge6"
+        }
+    ]
+}

Resources/Textures/Objects/Specific/Chemistry/bottle_small.rsi/meta.json

@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bottlesmall"
+        },
+        {
+            "name": "bottlesmall1"
+        },
+        {
+            "name": "bottlesmall2"
+        },
+        {
+            "name": "bottlesmall3"
+        },
+        {
+            "name": "bottlesmall4"
+        },
+        {
+            "name": "bottlesmall5"
+        },
+        {
+            "name": "bottlesmall6"
+        }
+    ]
+}

Resources/Textures/Objects/Storage/boxes.rsi/meta.json

@@ -10,6 +10,9 @@
         {
             "name": "beaker"
         },
+        {
+            "name": "bottleplastic"
+        },
         {
             "name": "bodybags"
         },

Resources/Textures/Objects/Storage/boxicons.rsi/meta.json

@@ -10,6 +10,9 @@
     {
       "name": "beaker"
     },
+    {
+      "name": "bottleplastic"
+    },
     {
       "name": "bodybags"
     },