From f110b9459c13701b9b1535b21eb2239436748952 Mon Sep 17 00:00:00 2001
From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com>
Date: Sun, 5 Jan 2025 02:24:06 +0300
Subject: [PATCH] Hotfix 2 (#376)

* hotfix

* hotfix 2.2

* hotfix 2.3
---
 .../Objects/Consumable/Food/Baked/pizza.yml   | 26 +------------------
 .../Objects/Consumable/Food/Baked/pizza.yml   |  2 --
 .../Entities/Objects/Tools/CombatUtility.yml  |  5 ++++
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index cec32685e9e..154f34063c8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -79,10 +79,6 @@
     - state: margherita
   - type: SliceableFood
     slice: FoodPizzaMargheritaSlice
-  - type: Tag
-    tags:
-    - Pizza
-    - Vegetable
 
 - type: entity
   name: slice of margherita pizza
@@ -98,10 +94,6 @@
   - type: Sprite
     layers:
     - state: margherita-slice
-  - type: Tag
-    tags:
-    - Pizza
-    - Vegetable
 
 - type: entity
   name: meat pizza
@@ -210,11 +202,7 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 5
-  - type: Tag
-    tags:
-    - Pizza
-    - Vegetable
-    
+
 - type: entity
   name: slice of vegetable pizza
   parent: FoodPizzaSliceBase
@@ -244,10 +232,6 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 1
-  - type: Tag
-    tags:
-    - Pizza
-    - Vegetable
 
 # Tastes like crust, tomato, cheese, carrot.
 
@@ -340,10 +324,6 @@
           Quantity: 5
         - ReagentId: DoctorsDelight
           Quantity: 6
-  - type: Tag
-    tags:
-    - Pizza
-    - Vegetable
 
 - type: entity
   name: slice of dank pizza
@@ -371,10 +351,6 @@
           Quantity: 0.8
         - ReagentId: DoctorsDelight
           Quantity: 1
-  - type: Tag
-    tags:
-    - Pizza
-    - Vegetable
 # Tastes like crust, tomato, cheese, meat, satisfaction.
 
 - type: entity
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 4a69d6a220f..010a98e157e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -24,7 +24,6 @@
   - type: Tag
     tags:
     - Pizza
-    - Vegetable # Yes, I am aware that corn is technically a fruit, but the tagging system is enough of a mess as it is
 
 - type: entity
   name: slice of corncob crust pizza
@@ -50,7 +49,6 @@
   - type: Tag
     tags:
     - Pizza
-    - Vegetable
 
 - type: entity
   name: firecracker pizza
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml
index bd8dcba00ed..6e7881f3bcc 100644
--- a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml
+++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml
@@ -43,6 +43,11 @@
             False: { visible: false }
     - type: Speech
       speechVerb: Robotic
+    - type: ItemToggle
+      soundActivate:
+        path: /Audio/Items/Defib/defib_safety_on.ogg
+      soundDeactivate:
+        path: /Audio/Items/Defib/defib_safety_off.ogg
     - type: StaticPrice
       price: 50