space-station-14 icon indicating copy to clipboard operation
space-station-14 copied to clipboard

Published 20 hours ago • verified publisher icon space-wizards

Bartender "Essentials"

Open musicmanvr opened this issue 1 year ago • 11 comments

About the PR

This PR adds a few drinks that felt strangely absent from the bartender's arsenal while also adding Sol Dry from /tg/.

Why / Balance

None of these drinks have any special effects, and all exist purely to add more depth to bartender's arsenal.

Technical details

  • 10 New Reagents.
  • Sol Dry added to all soda vending machines.
  • Energy Drink removed from soda-vend, coconut water added.

Media

image From left to right; Arnold Palmer, Coconut Rum, Cosmopolitan, Painkiller, Pina Colada, Roy Rodgers, Shirley Temple and Blue Hawaiian.

  • [ X ] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Nothing crazy, just some new reagents for bartenders to enjoy. Changelog

:cl:

  • add: Added Sol Dry, 8 new cocktails and coconut water.

musicmanvr avatar Feb 18 '24 18:02 musicmanvr

RSI Diff Bot; head commit 12eb2842813f914e59b36818a5607dd62aa3340e merging into 0dd381ae37a1ae40e23c98d7310388b425bbe2a6 This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi

State Old New Status
icon Added
icon_open Added
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi

State Old New Status
icon Added
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi

State Old New Status
icon Added
icon_open Added
inhand-left Added
inhand-right Added
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi

State Old New Status
icon Added
Edit: diff updated after 12eb2842813f914e59b36818a5607dd62aa3340e

github-actions[bot] avatar Feb 18 '24 18:02 github-actions[bot]

But why remove energy drink? D:

Hanzdegloker avatar Feb 18 '24 18:02 Hanzdegloker

I don't quite get removing the energy drink but those new drinks look fun!

beck-thompson avatar Feb 18 '24 19:02 beck-thompson

Nice! If these get merged, I'll make fill levels for them too!

Tayrtahn avatar Feb 18 '24 20:02 Tayrtahn

I believe that Arnold Palmer is copyrighted, though I'm not sure if using it is against any laws.

OctoRocket avatar Feb 18 '24 22:02 OctoRocket

i think sol dry is only meant to be in certain soda machines idk what ones tho

potato1234x avatar Feb 18 '24 22:02 potato1234x

I don't think Arnold Palmer is an issue, tbh. Arizona (iced tea) appears to own the trademark to use Arnold Palmer's signature to market the beverage, but it's been a generic name for that drink for decades. Same deal as the Shirley Temple, actually.

Since we're not using the name to sell a drink, I'm pretty sure we're in the clear, but I'm not a lawyer.

Tayrtahn avatar Feb 18 '24 23:02 Tayrtahn

i think sol dry is only meant to be in certain soda machines idk what ones tho

mainly added it to all machines since ginger ale is pretty much a universally drank soda like grape/root beer/lemon lime, plus it gives crew more soda to inevitably empty all over the floor/drink before the machine needs to be restocked

musicmanvr avatar Feb 19 '24 00:02 musicmanvr

I don't think Arnold Palmer is an issue, tbh. Arizona (iced tea) appears to own the trademark to use Arnold Palmer's signature to market the beverage, but it's been a generic name for that drink for decades. Same deal as the Shirley Temple, actually.

Since we're not using the name to sell a drink, I'm pretty sure we're in the clear, but I'm not a lawyer.

my main form of reassurance is that tg has been using the name for years now without any issues, that and since we're not making any direct monetary gains off of using the name through a project under open licensing there isn't really any worry in my mind

if it's something that makes people nervous I can change it to half and half

musicmanvr avatar Feb 19 '24 00:02 musicmanvr

names should be fine imo

mirrorcult avatar Feb 19 '24 06:02 mirrorcult

on second thought arnold palmer should be changed but shirley temple is probably fine

mirrorcult avatar Feb 19 '24 06:02 mirrorcult

aw man, not the energy drink.

Hanzdegloker avatar Apr 01 '24 06:04 Hanzdegloker