From 25c8fa2e43c8f7dab1ccf1389d670986d9e39216 Mon Sep 17 00:00:00 2001 From: Farrellka-dev Date: Sun, 5 Jan 2025 01:30:32 +0300 Subject: [PATCH 1/3] hotfix --- .../Entities/Objects/Consumable/Food/Baked/pizza.yml | 2 -- 1 file changed, 2 deletions(-) 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 4a69d6a220..010a98e157 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 From 5d423a3a3581731dc9870a235712178543cf86cd Mon Sep 17 00:00:00 2001 From: Farrellka-dev Date: Sun, 5 Jan 2025 01:42:28 +0300 Subject: [PATCH 2/3] hotfix 2.2 --- .../Objects/Consumable/Food/Baked/pizza.yml | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index cec32685e9..154f34063c 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 From aced31c4584df46766206fdd5788d639814ca0ef Mon Sep 17 00:00:00 2001 From: Farrellka-dev Date: Sun, 5 Jan 2025 01:58:40 +0300 Subject: [PATCH 3/3] hotfix 2.3 --- .../_LostParadise/Entities/Objects/Tools/CombatUtility.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml index bd8dcba00e..6e7881f3bc 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