Merge pull request #332 from Corvax-Frontier/Mew

Реф... Респрайт медицины

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

@@ -0,0 +1,6 @@
+ent-ReliableContainer = надежный контейнер
+    .desc = Продвинутый контейнер для хранения медицинских препаратов.
+ent-ReliableContainerBruteFilled = надежный контейнер от мех-повреждений
+    .desc = Наполнен лекарствами, которые лечат серьезные повреждения.
+ent-ReliableContainerBurnFilled = надежный контейнер от физ-повреждений
+    .desc = Наполнен лекарствами, которые лечат ожоги.

Resources/Prototypes/Corvax/Catalog/Fills/Items/firstaidkits.yml

@@ -9,10 +9,8 @@
         amount: 2
       - id: RegenerativeMesh
         amount: 2
-      - id: BruteAutoInjector
-        amount: 2
-      - id: BurnAutoInjector
-        amount: 2
+      - id: ReliableContainerBruteFilled
+      - id: ReliableContainerBurnFilled
       - id: SpaceMedipen
         amount: 2
       - id: Bloodpack

Resources/Prototypes/Corvax/Entities/Objects/Fun/cards.yml

@@ -5,9 +5,6 @@
   description: A poker card with you can play.
   noSpawn: true
   components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: BasePokerCardFlipped
   - type: Item
     size: Tiny
   - type: Tag
@@ -20,7 +17,8 @@
     layers:
     - state: background
     - state: cover
-  - type: CargoSellBlacklist
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   name: playable card
@@ -29,17 +27,13 @@
   description: A poker card with you can play.
   noSpawn: true
   components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: BasePokerCard
   - type: Sprite
     sprite: Corvax/Objects/Fun/Cards/poker_cards.rsi
     scale: 0.5,0.5
     layers:
     - state: background
     - state: cover
     - state: logo
-  - type: CargoSellBlacklist
 
 - type: entity
   name: playable card
@@ -1936,9 +1930,6 @@
   description: A poker card with you can play.
   noSpawn: true
   components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: BasePokerCardClassicFlipped
   - type: Item
     size: Tiny
   - type: Tag
@@ -1951,7 +1942,8 @@
     layers:
     - state: background
     - state: cover
-  - type: CargoSellBlacklist
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   name: playable card
@@ -1960,17 +1952,13 @@
   description: A poker card with you can play.
   noSpawn: true
   components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: BasePokerCardClassic
   - type: Sprite
     sprite: Corvax/Objects/Fun/Cards/poker_cards_classic.rsi
     scale: 0.5,0.5
     layers:
     - state: background
     - state: cover
     - state: logo
-  - type: CargoSellBlacklist
 
 - type: entity
   name: playable card

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

@@ -0,0 +1,93 @@
+- type: entity
+  name: reliable container
+  parent: BaseItem
+  description: "Advanced container for storing medical products."
+  id: ReliableContainer
+  components:
+  - type: Sprite
+    sprite: Corvax/Objects/Specific/Chemistry/kit.rsi
+    layers:
+      - state: kit
+      - state: fill1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Item
+    sprite: Corvax/Objects/Specific/Chemistry/kit.rsi
+  - type: MeleeWeapon
+    soundNoDamage:
+      path: "/Audio/Effects/Fluids/splat.ogg"
+    damage:
+      types:
+        Blunt: 0
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 100
+  - type: MixableSolution
+    solution: beaker
+  - type: FitsInDispenser
+    solution: beaker
+  - type: RefillableSolution
+    solution: beaker
+  - type: DrainableSolution
+    solution: beaker
+  - type: ExaminableSolution
+    solution: beaker
+  - type: DrawableSolution
+    solution: beaker
+  - type: InjectableSolution
+    solution: beaker
+  - type: SolutionTransfer
+    canChangeTransferAmount: true
+  - type: SolutionItemStatus
+    solution: beaker
+  - type: UserInterface
+    interfaces:
+      enum.TransferAmountUiKey.Key:
+        type: TransferAmountBoundUserInterface
+  - type: Drink
+    solution: beaker
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: fill
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 100
+  - type: StaticPrice
+    price: 30
+
+- type: entity
+  name: brute reliable container 
+  parent: ReliableContainer
+  description: "Filled with medication that treat brute damage."
+  id: ReliableContainerBruteFilled
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 100
+        reagents:
+        - ReagentId: Bicaridine
+          Quantity: 75
+        - ReagentId: TranexamicAcid
+          Quantity: 25
+
+- type: entity
+  name: burn reliable container 
+  parent: ReliableContainer
+  description: "Filled with medication that treat burn damage."
+  id: ReliableContainerBurnFilled
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 100
+        reagents:
+        - ReagentId: Dermaline
+          Quantity: 50
+        - ReagentId: Leporazine
+          Quantity: 50

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -10,6 +10,7 @@
     sprite: Objects/Specific/Medical/medical.rsi
     heldPrefix: ointment
   # Inherited
+  - type: Appearance
   - type: StaticPrice
     price: 0
 
@@ -24,7 +25,9 @@
     tags:
     - Ointment
   - type: Sprite
-    state: ointment
+    layers:
+    - state: ointment
+      map: ["base"]
   - type: Item
     heldPrefix: ointment
   - type: Healing
@@ -42,6 +45,14 @@
       path: "/Audio/Items/Medical/ointment_end.ogg"
   - type: Stack
     stackType: Ointment
+    baseLayer: base
+    layerStates:
+    - ointment
+    - ointment_1
+    - ointment_2
+    - ointment_3
+    - ointment_4
+    - ointment_5
     count: 10
   - type: StackPrice
     price: 5
@@ -75,7 +86,9 @@
     tags:
     - Ointment
   - type: Sprite
-    state: regenerative-mesh
+    layers:
+    - state: regenerative-mesh
+      map: ["base"]
   - type: Item
     heldPrefix: regenerative-mesh
   - type: Healing
@@ -88,11 +101,21 @@
         Shock: -10
         Caustic: -10
     healingBeginSound:
-      path: "/Audio/Items/Medical/ointment_begin.ogg"
+      path: "/Audio/Items/Medical/brutepack_begin.ogg"
     healingEndSound:
-      path: "/Audio/Items/Medical/ointment_end.ogg"
+      path: "/Audio/Items/Medical/brutepack_end.ogg"
   - type: Stack
     stackType: RegenerativeMesh
+    baseLayer: base
+    layerStates:
+    - regenerative-mesh
+    - regenerative-mesh_1
+    - regenerative-mesh_2
+    - regenerative-mesh_3
+    - regenerative-mesh_4
+    - regenerative-mesh_5
+    - regenerative-mesh_6
+    - regenerative-mesh_7
     count: 10
   - type: StackPrice
     price: 20
@@ -117,7 +140,9 @@
     tags:
     - Brutepack
   - type: Sprite
-    state: brutepack
+    layers:
+    - state: brutepack
+      map: ["base"]
   - type: Healing
     damageContainers:
       - Biological
@@ -130,6 +155,14 @@
       path: "/Audio/Items/Medical/brutepack_end.ogg"
   - type: Stack
     stackType: Brutepack
+    baseLayer: base
+    layerStates:
+    - brutepack
+    - brutepack_1
+    - brutepack_2
+    - brutepack_3
+    - brutepack_4
+    - brutepack_5
     count: 10
   - type: StackPrice
     price: 5
@@ -163,7 +196,9 @@
     tags:
     - Brutepack
   - type: Sprite
-    state: medicated-suture
+    layers:
+    - state: medicated-suture
+      map: ["base"]
   - type: Item
     heldPrefix: medicated-suture
     storedRotation: -90
@@ -180,6 +215,12 @@
       path: "/Audio/Items/Medical/brutepack_end.ogg"
   - type: Stack
     stackType: MedicatedSuture
+    baseLayer: base
+    layerStates:
+    - medicated-suture
+    - medicated-suture_1
+    - medicated-suture_2
+    - medicated-suture_3
     count: 10
   - type: StackPrice
     price: 20
@@ -279,7 +320,9 @@
     tags:
     - Gauze
   - type: Sprite
-    state: gauze
+    layers:
+    - state: gauze
+      map: ["base"]
   - type: Construction
     graph: Gauze
     node: gauze
@@ -297,6 +340,13 @@
       path: "/Audio/Items/Medical/brutepack_end.ogg"
   - type: Stack
     stackType: Gauze
+    baseLayer: base
+    layerStates:
+    - gauze
+    - gauze_1
+    - gauze_2
+    - gauze_3
+    - gauze_4
     count: 10
   - type: StackPrice
     price: 5
@@ -321,14 +371,19 @@
 - type: entity
   name: aloe cream
   description: A topical cream for burns.
-  parent: Ointment ##Yes it's a direct reskin
+  parent: Ointment ##Yes it's a direct reskin (WTF! - zekins3366)
   id: AloeCream
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/aloe.rsi
-    state: cream
+    layers:
+    - state: cream
+      map: ["base"]
   - type: Stack
     stackType: AloeCream
+    baseLayer: base
+    layerStates:
+    - cream
     count: 10
 
 - type: entity

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

@@ -22,7 +22,7 @@
         visible: false
   - type: Appearance
   - type: SolutionContainerVisuals
-    maxFillLevels: 6
+    maxFillLevels: 5 # Corvax-Frontier
     fillBaseName: bottle-1-
   - type: Drink
   - type: SolutionContainerManager