From d45b0a49074811b8a033ac1df3a87c7c15630980 Mon Sep 17 00:00:00 2001 From: SweptWasTaken Date: Fri, 7 May 2021 23:28:12 -0700 Subject: [PATCH] Removes a vestigal plate --- .../Objects/Consumable/Food/Baked/pie.yml | 8 ++-- .../Objects/Consumable/Food/Baked/pizza.yml | 2 +- .../Consumable/Food/Containers/plate.yml | 45 ++---------------- .../Consumable/Food/plates.rsi/meta.json | 9 ---- .../Food/plates.rsi/plate-pizza.png | Bin 265 -> 0 bytes .../Food/plates.rsi/plate-slice-shading.png | Bin 330 -> 0 bytes .../Consumable/Food/plates.rsi/plate-tart.png | Bin 266 -> 0 bytes 7 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-pizza.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-slice-shading.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-tart.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 9b0b90600c..230734b03b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -275,7 +275,7 @@ description: A tasty dessert that reminds you of the wine you didn't make. components: - type: Food - trash: FoodPlateSmall2 + trash: FoodPlateSmall - type: Sprite layers: - state: plate-tart @@ -289,7 +289,7 @@ description: "\" \"" components: - type: Food - trash: FoodPlateSmall2 + trash: FoodPlateSmall - type: Sprite layers: - state: plate-tart @@ -303,7 +303,7 @@ description: A tasty dessert that won't make it through a metal detector. components: - type: Food - trash: FoodPlateSmall2 + trash: FoodPlateSmall - type: Sprite layers: - state: plate-tart @@ -317,7 +317,7 @@ description: A tasty dessert made of chocolate, with a liquid core. components: - type: Food - trash: FoodPlateSmall2 + trash: FoodPlateSmall - type: Sprite layers: - state: plate-tart diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 2699e4aa0e..b3362a35df 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -28,7 +28,7 @@ abstract: true components: - type: Food - trash: PlateTart + trash: FoodPlateSmall - type: SolutionContainer maxVol: 5 contents: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index e9f8825235..efc81ff328 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -4,10 +4,10 @@ # is that system. Ideally, food on plates would have a system where when thrown, it would # break the plate and the loaf would fall off. -# Bread Plate +# Large Plate - type: entity - name: plate + name: large plate parent: BaseItem id: FoodPlate description: A large plate, excellent for bread. @@ -51,7 +51,7 @@ # Small Plate - type: entity - name: plate + name: small plate parent: Plate id: FoodPlateSmall description: A small plate. Delicate. @@ -87,45 +87,6 @@ state: plate-small-trash netsync: false -# A second small plate for different purposes. - -- type: entity - name: plate - parent: Plate - id: FoodPlateSmall2 - description: A small plate, excellent for a tart. - components: - - type: Sprite - sprite: Objects/Consumable/Food/plates.rsi - state: plate-tart -# Needs the full thing because inherting is dumb sometimes. - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 5 - behaviors: - - !type:PlaySoundCollectionBehavior - soundCollection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - PlateSmall2Trash: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - name: broken plate - parent: BaseItem - id: FoodPlateSmall2Trash - description: A broken plate. Useless. - components: - - type: Sprite - sprite: Objects/Consumable/Food/plates.rsi - state: plate-small-trash - netsync: false - # Plastic Plate - type: entity diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json index 0a96ac5f11..d0cfd10216 100644 --- a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json @@ -13,24 +13,15 @@ { "name": "plate-trash" }, - { - "name": "plate-pizza" - }, { "name": "plate-plastic" }, - { - "name": "plate-slice-shading" - }, { "name": "plate-small" }, { "name": "plate-small-trash" }, - { - "name": "plate-tart" - }, { "name": "plate-small-plastic" }, diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-pizza.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-pizza.png deleted file mode 100644 index 5f95d86cb38dc8aa7f2f66face0e8a05374ca5e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmV+k0rvihP)y-6X5dTc{)^?`IMMMNt$*QIx;O zumEk_Ug}WS^%1f-)>`AYHBE!$PP{Bj(9Mx~{UC||gNWyO4jSMth8m3c@98)D1xS|DA*RgoF5I`ZLos;ak7Jxju;%#R1?6DJXM~wEw#$ P00000NkvXXu0mjf4ry!l diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-slice-shading.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-slice-shading.png deleted file mode 100644 index 8874e9045456814d4a53d8380533e8a3a9e04c9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmV-Q0k!^#P)d$P64~ps!7d0R7DpjMeKFLVO1+rQkS@&3Hlx c`Og5n1JtxjyG5(VvH$=807*qoM6N<$f^v5Ie~A$UK@bE%_%#*R zA7i9BO%u(&?_-IpwU)BSair&}I<8^`63#g)Ue~qgteU2wX^hEsWEZhK6^9Ut1lqR! zh~y;Lg;ZWzd?b>Scs)x00$G9d9iMQP!3r$P0(D)3*7|lmzKa={#gV;)^E^kT6#jy+ zZ5w#+i;Atau