Removes duplicate fortune cookie (#16304)

Co-authored-by: Jeff <velcroboy333@hotmail.com>

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
index 21a8c7f53a0ecc2ef51fba6ed497f3550374e497..e5512e299ef23ad8106af3894c98c790cdff6f4d 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -47,7 +47,6 @@
       - FoodBakedBunHotX
       - FoodBakedBunMeat
       - FoodBakedCookie
-      - FoodBakedCookieFortune
       - FoodBakedCookieOatmeal
       - FoodBakedCookieRaisin
       - FoodBakedCookieSugar

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index 7b1b0c38abf26fb02128306e04cfc1efc2fc86e4..59a0e0fef5a769ad0053ffa5cb7d2d88085f2a1f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -104,17 +104,6 @@
   - type: Sprite
     state: COOKIE!!!
 
-- type: entity
-  name: fortune cookie
-  parent: FoodBakedBase
-  id: FoodBakedCookieFortune
-  description: A true prophecy in each cookie!
-  components:
-  # - Food:
-  #   trash: PaperFortune
-  - type: Sprite
-    state: cookie-fortune
-
 - type: entity
   name: oatmeal cookie
   parent: FoodBakedBase

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-fortune.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-fortune.png
deleted file mode 100644 (file)
index 48b2615..0000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-fortune.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
index 9c3951c69e4da8e6d990b1f800c2fb26bc32d742..9e123377e1fb75d8bd59848e215c1f82b552db3b 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
@@ -43,9 +43,6 @@
     {
       "name": "COOKIE!!!"
     },
-    {
-      "name": "cookie-fortune"
-    },
     {
       "name": "cookie-oatmeal"
     },

diff --git a/Resources/migration.yml b/Resources/migration.yml
index a7f004fbea1842d534b4aeb089f567707b4b8829..bc29c62beaecba4f457e0bd84cd9c78c662dbf54 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -50,3 +50,4 @@ BulletAntiMaterial: BulletAntiMateriel
 
 # 2023--05-10
 FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce
+FoodBakedCookieFortune: FoodSnackCookieFortune