space-station-14
space-station-14 copied to clipboard
Total Bartending Conversion (Part 1)
About the PR
Replaces all of bartending drinks, reagents, recipes, and textures with /tg/'s
Textures
- [ ] Bottles
- [ ] Glasses
Objects
- [ ] Alcoholic
Reagents
- [x] Alcoholic
Localization
- [x] Alcoholic
Recipies
- [ ] Alcoholic
Vendors/Reagent Dispensers
- [ ] Booze-O-Mat
- [x] Soda Fountain
- [x] Booze Dispenser
Removing old prototypes from maps
- [x] maptainers did this for me thx
:cl:
- tweak: Bartending is all different now, ill fill this in later.
RSI Diff Bot; head commit 350ec9a1adf6f1a57be138c9089924a82e2ea58a merging into 24b8d9468e460049e2e8056e9510428e60a510b1 This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/goldschlagerbottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi
State | Old | New | Status |
---|---|---|---|
icon | ![]() |
Removed |
Resources/Textures/Objects/Consumable/Drinks/bottle_broken.rsi
State | Old | New | Status |
---|---|---|---|
bottle_broken | ![]() |
Added |
how the fuck am I supposed to scroll through all this (rsi diff)
blaspheme
blaspheme
do not fret, it will be restored, just needed to unclog the hell that was the drinks RSI folder for sanity
This pull request has conflicts, please resolve those before we can evaluate the pull request.
Time to work on this again
Time to want to die again
reducing the scope of this
This pull request has conflicts, please resolve those before we can evaluate the pull request.
This pull request has conflicts, please resolve those before we can evaluate the pull request.
RIP hopes and dreams.