From: Velcroboy <107660393+ChilbroBaggins@users.noreply.github.com>
Date: Wed, 10 May 2023 14:20:27 +0000 (-0500)
Subject: Removes duplicate fortune cookie (#16304)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=74c1a17888a6b22c725fc7b8c1ad3d61d5d72fde;p=space-station-14.git

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 21a8c7f53a..e5512e299e 100644
--- 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 7b1b0c38ab..59a0e0fef5 100644
--- 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
index 48b26152ba..0000000000
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 9c3951c69e..9e123377e1 100644
--- 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 a7f004fbea..bc29c62bea 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -50,3 +50,4 @@ BulletAntiMaterial: BulletAntiMateriel
 
 # 2023--05-10
 FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce
+FoodBakedCookieFortune: FoodSnackCookieFortune