[Christmas] Y'all want a Smite Cranberry? (#33922)

* Add a festive lemon-lime soda variant: cranberry!

* Gave lemon-lime a brand name

* Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks.

* Extend the Christmas anomaly with extra jolliness

* Minor spelling mistake. Jollyness will not be denied.

* Removed redundant delay from meta file

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index f7730aa01f8677d1b588588062b3ba80c0a4bbc6..196886319797fa1ba617868911c52abe5a78473c 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -203,6 +203,7 @@ flavor-complex-dr-gibb = like malpractice
 flavor-complex-ginger-soda = like ginger
 flavor-complex-grape-soda = like grape soda
 flavor-complex-lemon-lime-soda = like lemon-lime soda
+flavor-complex-lemon-lime-cranberry-soda = like Christmas
 flavor-complex-pwr-game-soda = like gaming
 flavor-complex-root-beer-soda = like root beer
 flavor-complex-citrus-soda = like citrus soda

diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
index 300284aee923100e35b2dcee6c9e15f03afd51a5..4f4bdd1f5fe0873029586405612c0a0c58bd3dd7 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
@@ -22,6 +22,9 @@ reagent-desc-ice-cream = It was either this or the microwave, and nobody wants i
 reagent-name-lemon-lime = lemon-lime
 reagent-desc-lemon-lime = tangy lime and lemon soda
 
+reagent-name-lemon-lime-cranberry = lemon-lime-cranberry
+reagent-desc-lemon-lime-cranberry = Tart cranberry, Christmas, and a hint of lemon and lime.
+
 reagent-name-pwr-game = Pwr Game
 reagent-desc-pwr-game = The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to.
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 527c2595dd95d3a90dffc86785aed70c82f08aab..e43d918bb9cce34704d182934edb1b00ecf1fbe7 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -132,6 +132,8 @@
       amount: 2
     - id: DrinkLemonLimeCan
       amount: 2
+    - id: DrinkLemonLimeCranberryCan
+      amount: 2
     - id: DrinkFourteenLokoCan
       amount: 2
 
@@ -139,8 +141,10 @@
   id: CrateFoodSoftdrinksLarge
   parent: CratePlastic
   name: softdrinks bulk crate
-  description: Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 28 sodas.
+  description: Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 32 sodas.
   components:
+  - type: EntityStorage
+    capacity: 32 # Slightly over-sized CratePlastic to accomodate over 30 drink cans at once.
   - type: StorageFill
     contents:
       - id: DrinkColaCan
@@ -153,6 +157,8 @@
         amount: 4
       - id: DrinkLemonLimeCan
         amount: 4
+      - id: DrinkLemonLimeCranberryCan
+        amount: 4
       - id: DrinkFourteenLokoCan
         amount: 4
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
index ace91025623db1412a39ff610609f7c122a4771d..30166ca371ae9291425f777d97012dec060e2a92 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
@@ -7,6 +7,7 @@
     DrinkIcedTeaCan: 2
     DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
+    DrinkLemonLimeCranberryCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
     DrinkNukieCan: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
index 98513a48a4a4b5d9b26713de2d2d105bc1e7d900..04dbf38ed76b44fbf8785a83b758ab5ae505aa88 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
@@ -7,6 +7,7 @@
     DrinkIcedTeaCan: 2
     DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
+    DrinkLemonLimeCranberryCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
     DrinkNukieCan: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
index cb5a4f5c4bc868298abb78865513976c09a56fdf..d51075c35849aaa82a55604c94811dee9d19c2f4 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
@@ -8,6 +8,7 @@
     DrinkIcedTeaCan: 2
     DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
+    DrinkLemonLimeCranberryCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
     DrinkNukieCan: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
index 6ac70b26db20dcc0341cddeb00bd79c3f8c72331..6b9ff67f2bbee900f961ac22585447b95db29634 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
@@ -7,6 +7,7 @@
     DrinkIcedTeaCan: 2
     DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
+    DrinkLemonLimeCranberryCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
     DrinkNukieCan: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
index 339683d2c9a4d822543f1d6fa06b3a86ee8fa39d..4b2a9228135db0ea6db5fc2ea207d5b1d8574613 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -7,6 +7,7 @@
     DrinkIcedTeaCan: 3
     DrinkSolDryCan: 3
     DrinkLemonLimeCan: 3
+    DrinkLemonLimeCranberryCan: 3
     DrinkFourteenLokoCan: 3
   emaggedInventory:
     DrinkNukieCan: 3

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
index a5f570bd46aac3a07f30bf7217d03fdae9cdb14a..7b36a3fc81cd1f8a4287fbb320f620aab74b0e52 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
@@ -8,6 +8,7 @@
     DrinkIcedTeaCan: 2
     DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
+    DrinkLemonLimeCranberryCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
     DrinkNukieCan: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
index b1a74fc13e74911f4b2a14a841ca1e26431cba2f..0e7dcf7482e6d0f593e7ac1d4a3e317cf474f65a 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
@@ -7,6 +7,7 @@
     DrinkIcedTeaCan: 2
     DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
+    DrinkLemonLimeCranberryCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
     DrinkNukieCan: 2

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
index e3339082b34b19faa44a928f00f000ee0ced52af..6d36fa802b0a06b300e3843f7b41ae9758f2454e 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
@@ -19,6 +19,7 @@
       - DrinkColaCan
       - DrinkIcedTeaCan
       - DrinkLemonLimeCan
+      - DrinkLemonLimeCranberryCan
       - DrinkGrapeCan
       - DrinkRootBeerCan
       - DrinkSodaWaterCan

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index f5b733d37b1ece8814558196706566f63333ffb7..59fc1a83a542cfa411d4f73ac0ab15c3b2ee639c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -137,7 +137,7 @@
 - type: entity
   parent: DrinkCanBaseFull
   id: DrinkLemonLimeCan
-  name: lemon-lime can
+  name: Smite can
   description: You wanted ORANGE. It gave you Lemon-Lime.
   components:
   - type: SolutionContainerManager
@@ -152,6 +152,57 @@
   - type: Item
     sprite: Objects/Consumable/Drinks/lemon-lime.rsi
 
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkLemonLimeCranberryCan
+  name: Smite Cranberry can
+  description: Y'all want a Smite Cranberry? Beloved by administrators everywhere. Drink in moderation. A limited run for the holidays!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: LemonLimeCranberry
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.1"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/punch1.ogg
+    embedOnThrow: True
+  - type: ThrowingAngle
+    angle: 0
+  - type: LandAtCursor
+  - type: Ammo
+    muzzleFlash: null
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Blunt: 1
+        Cold: 2 # Refreshing
+
 - type: entity
   parent: DrinkCanBaseFull
   id: DrinkGrapeCan

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index ef6208b69d4090729e49895bac4db7cbeb539069..ed2324811e348d7bf5a5a04e54a8279411295b04 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -106,6 +106,7 @@
     - SpaceUp
     - SpaceMountainWind
     - LemonLime
+    - LemonLimeCranberry
     - PwrGame
   - quantity: 10
     weight: 3

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 22488bd4369e5eca97044257b26414a24f43798e..69621aa944309c248386dbf7a5e2bfddf97690de 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -694,6 +694,8 @@
         orGroup: DrinkPool
       - id: DrinkLemonLimeCan
         orGroup: DrinkPool
+      - id: DrinkLemonLimeCranberryCan
+        orGroup: DrinkPool
       - id: DrinkIcedTeaCan
         orGroup: DrinkPool
       - id: ToyMouse

diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index f111d6b1826984c4e16e5ef2b6e5b58705d05c1e..62025f668ee0a77ba8e238c2e4267336471b5180 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -983,4 +983,7 @@
         maxRange: 6
       spawns:
       - PresentRandomInsane
-  
\ No newline at end of file
+  - type: ProjectileAnomaly
+    projectilePrototype: DrinkLemonLimeCranberryCan
+    minProjectiles: 1
+    maxProjectiles: 3

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 611750fa7db61d55a3e94796bcb213c32872196a..24507c950aec61804648c58d81de66b8e1ccc4bf 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -674,6 +674,11 @@
   flavorType: Complex
   description: flavor-complex-lemon-lime-soda
 
+- type: flavor
+  id: lemonlimecranberrysoda
+  flavorType: Complex
+  description: flavor-complex-lemon-lime-cranberry-soda
+
 - type: flavor
   id: pwrgamesoda
   flavorType: Complex
@@ -1337,4 +1342,4 @@
 - type: flavor
   id: zombiecocktail
   flavorType: Complex
-  description: flavor-complex-zombiecocktail
\ No newline at end of file
+  description: flavor-complex-zombiecocktail

diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml
index 6108278a4ac1669a1e0bfe71721b71b4ba57bb27..7b2fdf3a2c5fd689a25930be8a376563b0d76a75 100644 (file)
--- a/Resources/Prototypes/Hydroponics/randomChemicals.yml
+++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml
@@ -85,6 +85,7 @@
     - Ethanol
     - FourteenLoko
     - LemonLime
+    - LemonLimeCranberry
     - Enzyme
     - Vinegar
     - Potassium

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 49290677a1e95d02df904eae9dad5152c359fbdf..7ddf19c14ea069d6bb88047f28707762781bac94 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -121,6 +121,15 @@
   flavor: lemonlimesoda
   color: "#878F00"
 
+- type: reagent
+  id: LemonLimeCranberry
+  name: reagent-name-lemon-lime-cranberry
+  parent: BaseSoda
+  desc: reagent-desc-lemon-lime-cranberry
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: lemonlimecranberrysoda
+  color: "#803C53"
+
 - type: reagent
   id: PwrGame
   name: reagent-name-pwr-game

diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index cf6da10b8b6679e2dadd7c548e7da65cb58f2b8e..9ae0493efe9298c719aa214306cd069be1a823d3 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -1230,4 +1230,4 @@
     ZombieBlood:
       amount: 1
   products:
-    ZombieCocktail: 4
\ No newline at end of file
+    ZombieCocktail: 4

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon.png
new file mode 100644 (file)
index 0000000..da2bf79
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..cc1a15c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/icon_open.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..aa14f15
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7e1507f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json
new file mode 100644 (file)
index 0000000..2151bee
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi; modified by AugustSun",
+  "states": [
+    {
+      "name": "icon"
+    },
+       {
+         "name": "icon_open"
+       },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}