New first aid kits (#3396)

Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml

@@ -34,6 +34,7 @@
   - type: StorageFill
     contents:
       - name: BoxSurvival
+      - name: Medkit
 
 - type: entity
   abstract: true

Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml

@@ -34,6 +34,7 @@
   - type: StorageFill
     contents:
       - name: BoxSurvival
+      - name: Medkit
 
 - type: entity
   abstract: true

Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml

@@ -34,6 +34,7 @@
   - type: StorageFill
     contents:
       - name: BoxSurvival
+      - name: Medkit
 
 - type: entity
   abstract: true

Resources/Prototypes/Catalog/Fills/firstaidkits.yml

@@ -0,0 +1,35 @@
+#Entities found at entities/objects/specific/medical
+- type: entity
+  id: MedkitFilled
+  suffix: Filled
+  parent: Medkit
+  components:
+  - type: StorageFill
+    contents:
+      - name: Brutepack
+        amount: 3
+      - name: Ointment
+        amount: 3
+      # todo 1 Health Analyzer once it exists. Remove brutepack and ointment for suture, gauze, mesh and medipen?
+      # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents
+      
+- type: entity
+  id: MedkitBurnFilled
+  suffix: Filled
+  parent: MedkitBurn
+  components:
+  - type: StorageFill
+    contents:
+      - name: Ointment
+        amount: 5
+        
+- type: entity
+  id: MedkitBruteFilled
+  suffix: Filled
+  parent: MedkitBrute
+  components:
+  - type: StorageFill
+    contents:
+      - name: Brutepack
+        amount: 5
+#todo TO DO - add first aid kits for rad, toxin, o2, advanced and combat.

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

@@ -1,30 +1,3 @@
-- type: entity
-  name: emergency medical kit
-  description: An emergency medical kit for those serious boo-boos.
-  parent: BaseItem
-  id: Medkit
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Medical/medical.rsi
-    state: medkit_r
-  - type: Storage
-    capacity: 60
-  - type: Item
-    size: 9999
-
-- type: entity
-  id: MedkitFilled
-  suffix: Filled
-  parent: Medkit
-  components:
-  - type: StorageFill
-    contents:
-      - name: Brutepack
-        amount: 3
-      - name: Ointment
-        amount: 3
-      # todo 1 Health Analyzer once it exists
-
 - type: entity
   name: medical stack
   id: MedicalStack
@@ -36,7 +9,7 @@
 
 - type: entity
   name: ointment
-  description: Used to treat those nasty burns.
+  description: "Used to treat those nasty burns."
   parent: MedicalStack
   id: Ointment
   components:
@@ -53,7 +26,7 @@
 
 - type: entity
   name: bruise pack
-  description: A therapeutic gel pack and bandages designed to treat blunt-force trauma.
+  description: "A therapeutic gel pack and bandages designed to treat blunt-force trauma."
   parent: MedicalStack
   id: Brutepack
   components:
@@ -70,17 +43,147 @@
 
 - type: entity
   name: roll of gauze
-  description: Some sterile gauze to wrap around bloody stumps.
+  description: "Some sterile gauze to wrap around bloody stumps."
   parent: MedicalStack
   id: Gauze
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medical.rsi
     state: gauze
-#  - type: Healing
+  - type: Healing
-#    heal:
+    heal:
-#      Blunt: 10
+      Blunt: 10
   - type: Stack
     stackType: Gauze
     max: 5
     count: 5
+    stacktype: enum.StackType.Gauze
+#first aid kit entities. See catalog/fills/firstaidkits for contents
+- type: entity
+  name: first aid kit
+  description: It's an emergency medical kit for those serious boo-boos.
+  parent: BaseItem
+  id: Medkit
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: firstaid
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: firstaid
+
+
+- type: entity
+  name: burn treatment kit
+  description: "A specialized medical kit for when the toxins lab *spontaneously* burns down."
+  parent: BaseItem
+  id: MedkitBurn
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: burnkit
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: burnkit
+
+- type: entity
+  name: toxin treatment kit
+  description: "Used to treat toxic blood content."
+  parent: BaseItem
+  id: MedkitToxin
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: toxinkit
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: toxinkit
+
+- type: entity
+  name: oxygen deprivation treatment kit
+  description: "A box full of oxygen goodies."
+  parent: BaseItem
+  id: MedkitO2
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: o2kit
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: o2kit
+
+- type: entity
+  name: brute trauma treatment kit
+  description: "A first aid kit for when you get toolboxed."
+  parent: BaseItem
+  id: MedkitBrute
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: brutekit
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: brutekit
+
+- type: entity
+  name: advanced first aid kit
+  description: "An advanced kit to help deal with advanced wounds."
+  parent: BaseItem
+  id: MedkitAdvanced
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: advkit
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: advkit
+
+- type: entity
+  name: radiation treatment kit
+  description: "If you took your Rad-X you wouldn't need this."
+  parent: BaseItem
+  id: MedkitRadiation
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: radkit
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: radkit
+
+- type: entity
+  name: combat medical kit
+  description: "For the big weapons among us."
+  parent: BaseItem
+  id: MedkitCombat
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: blackkit
+  - type: Storage
+    capacity: 50
+  - type: Item
+    size: 5
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    HeldPrefix: blackkit

Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json

@@ -0,0 +1,110 @@
+{
+	"version": 1,
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"license": "Taken from https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide",
+	"copyright": "CC-BY-SA-3.0",
+	"states": [
+		{
+			"name": "firstaid"
+		},
+		{
+      "name": "firstaid-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "firstaid-inhand-left",
+      "directions": 4
+    },
+		{
+			"name": "brutekit"
+		},
+		{
+      "name": "brutekit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "brutekit-inhand-left",
+      "directions": 4
+    },
+		{
+			"name": "burnkit"
+		},
+		{
+      "name": "burnkit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "burnkit-inhand-left",
+      "directions": 4
+    },
+		{
+			"name": "o2kit"
+		},
+		{
+      "name": "o2kit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "o2kit-inhand-left",
+      "directions": 4
+    },
+		{
+			"name": "radkit"
+		},
+		{
+      "name": "radkit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "radkit-inhand-left",
+      "directions": 4
+    },
+		{
+			"name": "toxinkit"
+		},
+		{
+      "name": "toxinkit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "toxinkit-inhand-left",
+      "directions": 4
+    },
+    {
+			"name": "purplekit"
+		},
+		{
+      "name": "purplekit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "purplekit-inhand-left",
+      "directions": 4
+    },
+    {
+			"name": "blackkit"
+		},
+		{
+      "name": "blackkit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "blackkit-inhand-left",
+      "directions": 4
+    },
+    {
+			"name": "advkit"
+		},
+		{
+      "name": "advkit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "advkit-inhand-left",
+      "directions": 4
+    }
+	]
+}

Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json

@@ -14,9 +14,6 @@
 		{
 			"name": "gauze"
 		},
-		{
-			"name": "medkit_r"
-		},
 		{
 			"name": "morphine"
 		},