From 7de1953c4c2e33c99d93c037e51385f0e7aee040 Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Sun, 30 Jan 2022 07:10:15 +0000
Subject: [PATCH] replaced nuka cola with nuclear cola (#6379)

---
 .../Entities/Objects/Consumable/drinks.yml          |   8 ++++----
 .../Prototypes/Reagents/Consumable/Drink/drinks.yml |   6 +++---
 Resources/Prototypes/Recipes/Reactions/drinks.yml   |   4 ++--
 .../icon.png                                        | Bin
 .../meta.json                                       |   0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename Resources/Textures/Objects/Consumable/Drinks/{nuka_colaglass.rsi => nuclear_colaglass.rsi}/icon.png (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/{nuka_colaglass.rsi => nuclear_colaglass.rsi}/meta.json (100%)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
index 7726c186df..bee404e018 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -1337,8 +1337,8 @@
 
 - type: entity
   parent: DrinkGlassBase
-  id: DrinkNukaColaGlass
-  name: nuka cola glass
+  id: DrinkNuclearColaGlass
+  name: nuclear cola glass
   description: Don't cry, Don't raise your eye, It's only nuclear wasteland.
   components:
   - type: SolutionContainerManager
@@ -1346,11 +1346,11 @@
       drink:
         maxVol: 50
         reagents:
-        - ReagentId: NukaCola
+        - ReagentId: NuclearCola
           Quantity: 50
   - type: Drink
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/nuka_colaglass.rsi
+    sprite: Objects/Consumable/Drinks/nuclear_colaglass.rsi
 
 - type: entity
   parent: DrinkGlassBase
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index c90c72993d..0457ae11e2 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -159,13 +159,13 @@
         # TODO heal mimes
 
 - type: reagent
-  id: NukaCola
-  name: nuka cola
+  id: NuclearCola
+  name: nuclear cola
   group: Drinks
   desc: Cola, cola never changes.
   physicalDesc: fizzy
   color: "#100800"
-  spritePath: nuka_colaglass.rsi
+  spritePath: nuclear_colaglass.rsi
   metabolisms:
     Drink:
       effects:
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 762891d65a..e0cb384bca 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -423,14 +423,14 @@
     Moonshine: 3
 
 - type: reaction
-  id: NukaCola
+  id: NuclearCola
   reactants:
     Cola:
       amount: 5
     Uranium:
       amount: 1
   products:
-    NukaCola: 5
+    NuclearCola: 5
 
 - type: reaction
   id: Patron
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuka_colaglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/nuka_colaglass.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuka_colaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/nuka_colaglass.rsi/meta.json
rename to Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/meta.json