Skip to content

Commit

Permalink
The Drinkening (#3019)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This pull request contains an incredible number of changes to item names
and descriptions regarding everything drinkable.
This has been a long time coming, and was put off for quite a while due
to my own procrastination.

This is almost certainly going to have mapping errors, but I'm not
checking them all myself. I'll let the tests figure it out for me.

- Space Mountain Wind changed to Comet Trail
- Dr. Gibb changed to Tadrixx
- Starkist changed to Lunapunch
- PWR Game changed to Pacfuel
- Lemon Lime changed to Orange Soda
- Nuka Cola removed
- Thirteen Loko changed to Vimukti
- Fetching Fizz removed
- Manhattan Project removed
- Narsour removed
- Monkey Energy changed to Xeno Energy
- unbranded water bottle changed to Ryuunosuke Reserve
- space beer changed to Bizircan Brewery GDM
- Magm-Ale changed to RHIMBASA TAP
- Space Cola reflavored
- Tonic water reflavored
- Soda water reflavored
- Grey Bull changed to Crosstalk
- E-Fuel removed
- Canned Air reflavored
- Molten Bubbles reflavored and refactored
- Plasma Fizz reflavored and refactored
- Gin reflavored
- Whiskey reflavored
- Vodka reflavored
- Tequila reflavored
- Patron reflavored
- Rum reflavored
- Holy water reflavored
- Vermouth reflavored
- Kahlua reflavored
- Goldschlager reflavored
- Cognac reflavored
- Wine reflavored
- Absinthe reflavored, randomization removed
- Premium Absinthe reflavored
- Lizard Wine reflavored, again
- Hard Cider reflavored
- Amaretto reflavored
- Grappa reflavored
- Sake reflavored, as well as random reskins
- Fernet reflavored
- Orange Juice reflavored
- Cream reflavored
- Tomato Juice reflavored
- Lime Juice reflavored
- Grenadine reflavored
- Applejack reflavored
- Champagne reflavored
- Blazaam reflavored to Hyperspace Highball(I've never even heard of
this?)
- Trappist Bleu reflavored
- Hooch reflavored
- Moonshine reflavored
- Creme de Coconut reflavored
- Cuba Libre reflavored to Frontier Libre
- White Russian reflavored to White Gezenan
- Irish Cream reflavored to Zohil Cream
- Manly Dorf reflavored to Shortstop
- B-52 reflavored to AM-G
- Irish Coffee reflavored to Gezenan Coffee
- Black Russian reflavored to Black Rachnid
- Manhattan reflavored to Twelve Crossings
- Red Mead reflavored to Drop-pod
- Allies Cocktail reflavored to Canton Cocktail
- Acid Spit reflavored to Cracked Moon
- Amasec reflavored to Ren Kirsi
- Irish Car Bomb reflavored to Lightspeed
- Syndicate Bomb reflavored to Gorlex Surprise
- Hivemind Eraser reflavored to Hivemind
- Erika Surprise reflavored to Terraformer Surprise
- Driest Martini reflavored to Saltflat
- Banana Honk reflavored to Creamtruck
- Silencer reflavored to Choker
- Hippie's Delight reflavored to Between the Mandibles
- Alexander reflavored to Ash-Shield
- Amaretto Alexander reflavored to Happy Huntsman
- Sidecar reflavored to Bridge Bunny
- Kamikaze reflavored to Mothball
- Moscow Mule reflavored to Gorlex Gator
- Fernet Cola reflavored to Weldline
- Branca Menta reflavored to Mirage
- Bug Spray reflavored to Stunball
- Jack Rose reflavored to Jackalope
- Duplex reflavored to North-South
- Mauna Loa reflavored to Inner Fire
- Mudder's Milk reflavored to Miner's Milk
- Freezer Burn reflavored to Hullbreach
- Archmagus' brew removed
- Cogchamp removed
- Shambler's Juice reflavored to Shoal Punch
- Gibb Floats reflavored to Tadrixx Float

Vending machines reflavored

Good lord I hope I didn't miss anything.

Immense thanks to Stripes for doing all of the writing for this, with
some help from our lore team. We miss you. I hope you're doing well.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Distances us from TG, and helps build our setting.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: @thestripes, @meemofcourse , @GenericDM 
tweak: reflavors nearly every drink ingame
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Stripes <[email protected]>
Co-authored-by: meemofcourse <[email protected]>
Co-authored-by: Theos <[email protected]>
  • Loading branch information
4 people authored Jun 17, 2024
1 parent 3051f1b commit 6b3d550
Show file tree
Hide file tree
Showing 45 changed files with 796 additions and 1,027 deletions.
11 changes: 2 additions & 9 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1859,15 +1859,8 @@
pixel_y = -32;
pixel_x = 32
},
/obj/item/reagent_containers/food/drinks/britcup{
desc = "A cup with a strange flag emblazoned on it.";
pixel_y = 4;
pixel_x = 9
},
/obj/item/reagent_containers/food/drinks/britcup{
desc = "A cup with a strange flag emblazoned on it.";
pixel_y = -2
},
/obj/item/reagent_containers/food/drinks/mug,
/obj/item/reagent_containers/food/drinks/mug,
/obj/item/reagent_containers/food/drinks/bottle/wine{
pixel_y = 10;
pixel_x = -9
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{
pixel_y = 12;
pixel_x = -7
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1156,10 +1156,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ruin/whitesands/pubbycrash/engine_room)
"Ak" = (
/obj/item/reagent_containers/food/drinks/britcup{
pixel_x = 9;
pixel_y = -3
},
/obj/item/reagent_containers/food/drinks/mug,
/obj/item/trash/pistachios{
pixel_y = 5
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/singularity_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3821,7 +3821,7 @@
pixel_x = 5;
pixel_y = -5
},
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx{
pixel_x = -4;
pixel_y = 2
},
Expand Down Expand Up @@ -4180,7 +4180,7 @@
/area/ruin/space/has_grav/singularitylab/civvie)
"qt" = (
/obj/structure/table,
/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail{
pixel_x = -6
},
/obj/item/radio/intercom/directional/east,
Expand Down Expand Up @@ -13228,7 +13228,7 @@
default_raw_text = "Whatever happens. Happens."
},
/obj/item/pen,
/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
pixel_x = 10;
pixel_y = 4
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5554,11 +5554,11 @@
/obj/item/reagent_containers/food/drinks/soda_cans/cola{
pixel_x = 5
},
/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
pixel_x = -5
},
/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch,
/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
pixel_x = 5
},
/obj/item/storage/box/drinkingglasses,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4179,7 +4179,7 @@
"aNr" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/item/reagent_containers/food/drinks/britcup,
/obj/item/reagent_containers/food/drinks/mug,
/obj/structure/window/reinforced{
dir = 8
},
Expand Down Expand Up @@ -4527,7 +4527,7 @@
/obj/item/reagent_containers/food/condiment/peppermill{
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/britcup,
/obj/item/reagent_containers/food/drinks/mug,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
Expand Down
9 changes: 3 additions & 6 deletions _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3689,10 +3689,7 @@
pixel_y = -5;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/britcup{
pixel_x = -7;
pixel_y = 10
},
/obj/item/reagent_containers/food/drinks/mug,
/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
dir = 4
},
Expand Down Expand Up @@ -9793,7 +9790,7 @@
pixel_y = -3
},
/obj/item/reagent_containers/food/snacks/meatbun,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda{
pixel_y = 12;
pixel_x = -8
},
Expand Down Expand Up @@ -12833,7 +12830,7 @@
/obj/item/reagent_containers/food/snacks/nachos{
pixel_y = 9
},
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{
pixel_x = 8;
pixel_y = 3
},
Expand Down
14 changes: 3 additions & 11 deletions _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1341,10 +1341,7 @@
pixel_x = 8;
pixel_y = 7
},
/obj/item/reagent_containers/food/drinks/britcup{
pixel_x = -6;
pixel_y = -1
},
/obj/item/reagent_containers/food/drinks/mug,
/obj/item/phone{
pixel_x = 9;
pixel_y = -2
Expand Down Expand Up @@ -3155,10 +3152,7 @@
pixel_x = 4;
pixel_y = 1
},
/obj/item/reagent_containers/food/drinks/britcup{
pixel_x = -5;
pixel_y = 7
},
/obj/item/reagent_containers/food/drinks/mug,
/obj/effect/turf_decal/siding/wood,
/obj/item/lipstick{
pixel_x = -5;
Expand Down Expand Up @@ -4831,9 +4825,7 @@
dir = 4
},
/obj/structure/table/wood/reinforced,
/obj/item/reagent_containers/food/drinks/britcup{
pixel_x = 9
},
/obj/item/reagent_containers/food/drinks/mug,
/turf/open/floor/plasteel/sepia,
/area/ship/crew/canteen)
"VK" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/independent/independent_tranquility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -995,9 +995,9 @@
name = "Minifridge"
},
/obj/item/reagent_containers/food/drinks/soda_cans/molten,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda,
/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel,
/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel,
/obj/item/reagent_containers/food/drinks/soda_cans/random,
/obj/item/reagent_containers/food/drinks/soda_cans/random,
/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
Expand Down
5 changes: 1 addition & 4 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11028,10 +11028,7 @@
pixel_x = -5;
pixel_y = -12
},
/obj/item/reagent_containers/food/drinks/britcup{
pixel_x = 8;
pixel_y = -4
},
/obj/item/reagent_containers/food/drinks/mug,
/obj/item/newspaper{
pixel_x = -8;
pixel_y = 5
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
) = 1,
list(//drinks
/obj/item/reagent_containers/food/drinks/bottle/vodka = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/crosstalk = 1,
) = 1,
list(//sprayers
/obj/item/reagent_containers/spray = 1,
Expand Down
11 changes: 5 additions & 6 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -524,13 +524,12 @@
/obj/item/reagent_containers/food/snacks/rofflewaffles,
/obj/item/reagent_containers/food/snacks/donkpocket,
/obj/item/reagent_containers/food/drinks/soda_cans/cola,
/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail,
/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx,
/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch,
/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel,
/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda
))
new rig_snacks(src)

Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/structures/icemoon/cave_entrance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -797,9 +797,9 @@ GLOBAL_LIST_INIT(ore_probability, list(
visible_message("<span class='userdanger'>You hear a geiger counter click and smell ash.</span>")
playsound(loc,'sound/items/radiostatic.ogg', 100, FALSE, 50, TRUE, TRUE)
if(prob(50))
new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc)
new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc)
new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc)
new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc)
new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc)
new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc)
new /mob/living/simple_animal/hostile/cockroach/glockroach(loc)
if(prob(50))
new /obj/structure/radioactive/stack(loc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@
availability_prob = 80
unlimited = TRUE

/datum/blackmarket_item/consumable/thirteenloko
name = "Can of Thirteen Loko"
/datum/blackmarket_item/consumable/vimukti
name = "Can of Vimukti"
desc = "This product was quietly discontinued after multiple health related incidents. But you aren't a coward, are you?"
item = /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
item = /obj/item/reagent_containers/food/drinks/soda_cans/vimukti

price_min = 10
price_max = 50
Expand Down
5 changes: 1 addition & 4 deletions code/modules/cargo/bounties/reagent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
/datum/reagent/consumable/ethanol/syndicatebomb,\
/datum/reagent/consumable/ethanol/tequila_sunrise,\
/datum/reagent/consumable/ethanol/manly_dorf,\
/datum/reagent/consumable/ethanol/thirteenloko,\
/datum/reagent/consumable/ethanol/vimukti,\
/datum/reagent/consumable/triple_citrus,\
/datum/reagent/consumable/ethanol/vodkamartini,\
/datum/reagent/consumable/ethanol/whiskeysoda,\
Expand Down Expand Up @@ -100,10 +100,7 @@
/datum/reagent/consumable/ethanol/booger,\
/datum/reagent/consumable/ethanol/hippies_delight,\
/datum/reagent/consumable/ethanol/drunkenblumpkin,\
/datum/reagent/consumable/ethanol/fetching_fizz,\
/datum/reagent/consumable/ethanol/goldschlager,\
/datum/reagent/consumable/ethanol/manhattan_proj,\
/datum/reagent/consumable/ethanol/narsour,\
/datum/reagent/consumable/ethanol/neurotoxin,\
/datum/reagent/consumable/ethanol/patron,\
/datum/reagent/consumable/ethanol/quadruple_sec,\
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
cost = 5000
contains = list(/obj/item/stack/sheet/mineral/coal/five,
/obj/machinery/grill/unwrenched,
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy)
/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy)
crate_name = "grilling starter kit crate"
crate_type = /obj/structure/closet/crate/large

Expand Down
Loading

0 comments on commit 6b3d550

Please sign in to comment.