diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index f7730aa01f..1968863197 100644 --- 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 300284aee9..4f4bdd1f5f 100644 --- 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 527c2595dd..e43d918bb9 100644 --- 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 ace9102562..30166ca371 100644 --- 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 98513a48a4..04dbf38ed7 100644 --- 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 cb5a4f5c4b..d51075c358 100644 --- 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 6ac70b26db..6b9ff67f2b 100644 --- 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 339683d2c9..4b2a922813 100644 --- 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 a5f570bd46..7b36a3fc81 100644 --- 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 b1a74fc13e..0e7dcf7482 100644 --- 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 e3339082b3..6d36fa802b 100644 --- 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 f5b733d37b..59fc1a83a5 100644 --- 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 ef6208b69d..ed2324811e 100644 --- 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 22488bd436..69621aa944 100644 --- 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 f111d6b182..62025f668e 100644 --- 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 611750fa7d..24507c950a 100644 --- 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 6108278a4a..7b2fdf3a2c 100644 --- 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 49290677a1..7ddf19c14e 100644 --- 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 cf6da10b8b..9ae0493efe 100644 --- 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 index 0000000000..da2bf7983a 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 index 0000000000..cc1a15c183 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 index 0000000000..aa14f15e1a 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 index 0000000000..7e1507f80a 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 index 0000000000..2151beeb21 --- /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 + } + ] +}