From 74c1a17888a6b22c725fc7b8c1ad3d61d5d72fde Mon Sep 17 00:00:00 2001
From: Velcroboy <107660393+ChilbroBaggins@users.noreply.github.com>
Date: Wed, 10 May 2023 09:20:27 -0500
Subject: [PATCH] Removes duplicate fortune cookie (#16304)

Co-authored-by: Jeff <velcroboy333@hotmail.com>
---
 .../Random/Food_Drinks/food_baked_single.yml      |   1 -
 .../Objects/Consumable/Food/Baked/misc.yml        |  11 -----------
 .../Food/Baked/misc.rsi/cookie-fortune.png        | Bin 430 -> 0 bytes
 .../Consumable/Food/Baked/misc.rsi/meta.json      |   3 ---
 Resources/migration.yml                           |   1 +
 5 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-fortune.png

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 48b26152baa44291edd978ef6a62306fd303f4b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 430
zcmV;f0a5;mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004XNkl<Zc%1E(
zy-vbV6o5ZWV;L}nrl|rZk_br|<OPi30azS(4W5RLnbDQa1)YowaiN47`4Kfulcvgm
zSW*W<0~(XIY8>o0wI}zU^W~g-TZo8=h=}-OVqrG5YO=fjUa6a*@&p!G72cJ0I6B<(
z;^)`>&?3G!v}&@e8xF^63Q3ZXb0q*oTLWNX&FSjHz!F<wif2>X#1)lMufuCn1t6Q+
zrkFqYG@c(3SRqN0_dGK+hT}1#UdM}tk?<v;8xDCz@QTC=r--(OZa6frT>4M54T&K5
z5_oiSUUGBlFf*2Oua*m>g#pbgm$vqdIduXR2N3)$I?3E~`LIvXnj_~*#1$3S){qkd
z)pCKecAxGoyuB>b1v!Ym1lAF4jTt~vMO>5Ubnil4Lti7P)XmsQ=AOpIf{8W99NZw<
zn%8nGMC$_ye3WQhEHI}IazfZRfME#Svegy4eAxG5X<<NK5q|ee_?5_t@B9xUA|n1b
Y@3@necr?JS(f|Me07*qoM6N<$f{X*cV*mgE

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
-- 
2.51.2