From 7dea122679160a0600f2735657a2e70f7dc6edf7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 13 Mar 2023 02:57:27 +0100 Subject: [PATCH] [MIRROR] Cleans up Generate Vintage Code for Unlabeled Wine [MDB IGNORE] (#19798) * Cleans up Generate Vintage Code for Unlabeled Wine (#73912) ## About The Pull Request I should have done this or something similar in #70827 but I think I thought it was too out of scope. The gist is that we just get rid of a completely un-necessary var (since it's a macro now), as well as multi-line and alphabetize the lists present. simple really ## Why It's Good For The Game Save the time of having a var for something that already points to a macro, also multilined lists are swag ## Changelog nothing that concerns players * Cleans up Generate Vintage Code for Unlabeled Wine --------- Co-authored-by: san7890 --- .../reagent_containers/cups/glassbottle.dm | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index f5271d0ab45..9128e71f2b5 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -362,10 +362,23 @@ desc = "There's no label on this wine bottle." /obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled/generate_vintage() - var/current_year = CURRENT_STATION_YEAR - var/year = rand(current_year-50,current_year) - var/type = pick("Sparkling","Dry White","Sweet White","Rich White","Rose","Light Red","Medium Red","Bold Red","Dessert") - var/origin = pick("Nanotrasen","Syndicate","Local") + var/year = rand(CURRENT_STATION_YEAR - 50, CURRENT_STATION_YEAR) + var/type = pick( + "Bold Red", + "Dessert", + "Dry White", + "Light Red", + "Medium Red", + "Rich White", + "Rose", + "Sparkling", + "Sweet White", + ) + var/origin = pick( + "Local", + "Nanotrasen", + "Syndicate", + ) return "[year] [origin] [type]" /obj/item/reagent_containers/cup/glass/bottle/absinthe