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

Total Bartending Conversion (Part 1)

Open ZeroDayDaemon opened this issue 2 years ago • 8 comments

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.

ZeroDayDaemon avatar Jul 04 '22 16:07 ZeroDayDaemon

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
Edit: diff updated after 350ec9a1adf6f1a57be138c9089924a82e2ea58a

github-actions[bot] avatar Jul 04 '22 16:07 github-actions[bot]

how the fuck am I supposed to scroll through all this (rsi diff)

Just-a-Unity-Dev avatar Jul 04 '22 16:07 Just-a-Unity-Dev

image blaspheme

mirrorcult avatar Jul 11 '22 06:07 mirrorcult

image blaspheme

do not fret, it will be restored, just needed to unclog the hell that was the drinks RSI folder for sanity

ZeroDayDaemon avatar Jul 11 '22 06:07 ZeroDayDaemon

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] avatar Jul 24 '22 01:07 github-actions[bot]

Time to work on this again

ZeroDayDaemon avatar Jul 26 '22 17:07 ZeroDayDaemon

Time to want to die again

ZeroDayDaemon avatar Aug 09 '22 19:08 ZeroDayDaemon

reducing the scope of this

ZeroDayDaemon avatar Aug 09 '22 19:08 ZeroDayDaemon

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] avatar Aug 30 '22 06:08 github-actions[bot]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] avatar Sep 04 '22 17:09 github-actions[bot]

RIP hopes and dreams.

Pangogie avatar Sep 11 '22 09:09 Pangogie