Emergency toolbox fill rework (#29202)

* emergency toolbox fill rework

* Fuck

diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index 87921a71d4fe652e43aec38639b1016bc6e2139d..1091207bba4748914f9e568838f98412a488ef71 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -7,24 +7,22 @@
   - type: StorageFill
     contents:
       - id: CrowbarRed
-      - id: ClothingMaskBreath
-      - id: ClothingMaskBreath
-        prob: 0.5
-      - id: EmergencyOxygenTankFilled
-      - id: EmergencyOxygenTankFilled
-        prob: 0.5
-      - id: FoodTinMRE
-      - id: FoodTinMRE
-        prob: 0.5
-      - id: DrinkWaterBottleFull
-      - id: DrinkWaterBottleFull
-        prob: 0.5
+      - id: RadioHandheld
+      - id: WelderMini
+      - id: FireExtinguisherMini
+      # Random lighting item orGroup
       - id: FlashlightLantern
-      - id: FlashlightLantern
-        prob: 0.5
+        orGroup: LightingItem
+      - id: Flare
+        orGroup: LightingItem
+      - id: GlowstickBase
+        orGroup: LightingItem
+      # Low-chance items
+      - id: FoodSnackChocolate
+        prob: 0.15
       - id: HarmonicaInstrument
         prob: 0.15
-
+ 
 - type: entity
   id: ToolboxElectricalFilled
   name: electrical toolbox

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 71629919ae4ea961a036996c58f19b3d1e5a20dc..5aaa58dbbeeec31dd165460798794f49863e05f3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -75,3 +75,36 @@
   - type: VaporVisuals
     animationTime: 0.8
     animationState: extinguish
+
+- type: entity
+  name: pocket fire extinguisher
+  parent: FireExtinguisher
+  id: FireExtinguisherMini
+  description: A light and compact fibreglass-framed model fire extinguisher. It holds less water then its bigger brother.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/fire_extinguisher_mini.rsi
+    layers:
+        - state: fire_extinguisher_closed
+          map: [ "enabled" ]
+  - type: Item
+    sprite: Objects/Misc/fire_extinguisher_mini.rsi
+    size: Small
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 30
+        reagents:
+        - ReagentId: Water
+          Quantity: 30
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    damage:
+      types:
+        Blunt: 3 #completely ineffective; your fists are better
+    soundHit:
+      path: /Audio/Effects/weak_hit1.ogg
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+      Glass: 40
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_closed.png b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_closed.png
new file mode 100644 (file)
index 0000000..3ae6804
Binary files /dev/null and b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_closed.png differ

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_open.png b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_open.png
new file mode 100644 (file)
index 0000000..66d3d78
Binary files /dev/null and b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_open.png differ

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..570b1db
Binary files /dev/null and b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..3a62d5a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/meta.json
new file mode 100644 (file)
index 0000000..db18856
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation13 at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. Edited by Flareguy for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "fire_extinguisher_open"
+    },
+    {
+      "name": "fire_extinguisher_closed"
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}