Nevada Beverage Co. Official Doppler Shift Endorsement #849
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /obj/item/clothing/shoes/nevada_kicks | ||
| name = "\improper Nevada Beverage Co. kicks" | ||
| desc = "Kicks as fresh as their ingredients, at least according to the tags. The smell of leather is mysteriously \ | ||
| absent." | ||
| icon = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' | ||
| icon_state = "nevada_kicks" | ||
| worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /// the official drink brand of doppler shift now comes in an official, exclusive file! | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea | ||
| name = "\improper Nevada green tea can" | ||
| desc = "A staple item of fuel stations, bodegas, convenience stores, and checkout aisle coolers. Cheaper than water, \ | ||
| yet begging the question why." | ||
| icon_state = "nevada_can" | ||
| volume = 55 | ||
| list_reagents = list(/datum/reagent/consumable/icetea = 50, /datum/reagent/consumable/honey = 5) | ||
| custom_price = PAYCHECK_LOWER | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/bottle | ||
| name = "\improper Nevada green tea bottle" | ||
| desc = "A resealable version of the venerable Nevada drink can. The convenience doesn't totally cancel out \ | ||
| the fact that this one is smaller and costs more." | ||
| icon_state = "nevada_bottle" | ||
| volume = 45 | ||
| list_reagents = list(/datum/reagent/consumable/icetea = 40, /datum/reagent/consumable/honey = 5) | ||
| custom_price = PAYCHECK_LOWER * 1.1 | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/jug | ||
| name = "\improper Nevada green tea jug" | ||
| desc = "Your favorite Nevada flavor, now with 385 grams of sugar!" | ||
| icon_state = "jug" | ||
| fill_icon = "modular_doppler/modular_food_drinks_and_chems/icons/drinks.dmi" | ||
| volume = 300 | ||
| fill_icon_thresholds = list(0, 30, 60, 120, 180, 240, 300) | ||
| possible_transfer_amounts = list(5, 10, 15, 30, 50, 100, 200, 300) | ||
| list_reagents = list(/datum/reagent/consumable/icetea = 250, /datum/reagent/consumable/honey = 50) | ||
| custom_price = PAYCHECK_LOWER * 3.5 | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/blueberry | ||
| name = "\improper Nevada Blueberry Blast™" | ||
| desc = "A can featuring a bushel of blueberries front and center. The slogan alliterates impressively, but \ | ||
| it makes it difficult to read without cringing." | ||
| icon_state = "nevada_blueberry" | ||
| list_reagents = list(/datum/reagent/consumable/berryjuice/blueberry = 50, /datum/reagent/consumable/honey = 5) | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/raspberry | ||
| name = "\improper Nevada Raspberry Rampage™" | ||
| desc = "Red raspberry emblazoned art promises a rush of red 40 and artificial flavoring." | ||
| icon_state = "nevada_blueberry" | ||
| list_reagents = list(/datum/reagent/consumable/berryjuice = 50, /datum/reagent/consumable/honey = 5) | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/lemonade | ||
| name = "\improper Nevada Lemonade can" | ||
| desc = "Technically this has a celebrity endorsement, but the man on the can is a stranger to anyone born after \ | ||
| 2375." | ||
| icon_state = "nevada_lemonade" | ||
| list_reagents = list(/datum/reagent/consumable/lemonade = 50, /datum/reagent/consumable/honey = 5) | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/lemonade/bottle //sorry for this path right here | ||
|
Collaborator
There was a problem hiding this comment. then don't do it unless you've got a very good reason neither of the bottles nor the jug should be soda can subtypes, given that means they keep all the can-specific behaviours that they probably shouldn't...
Collaborator
Author
There was a problem hiding this comment. yeah sorry this is rough draft stuff I'll review what I want these to be under later |
||
| name = "\improper Nevada Lemonade bottle" | ||
| desc = "A resealable bottle filled with refreshing Nevada lemonade." | ||
| icon_state = "nevada_lemonade_bottle" | ||
| volume = 45 | ||
| list_reagents = list(/datum/reagent/consumable/lemonade = 40, /datum/reagent/consumable/honey = 5) | ||
| custom_price = PAYCHECK_LOWER * 1.1 | ||
|
|
||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/preworkout | ||
| name = "\improper Nevada 'Sweet-Tooth' pre-Workout shake" | ||
| desc = "How something of this viscosity fits through the mouth of a beverage can is the subject of heated debate." | ||
| icon_state = "clown_preworkout" | ||
| list_reagents = list(/datum/reagent/consumable/nutriment/protein = 20, /datum/reagent/consumable/milk = 30, /datum/reagent/consumable/honey = 5) | ||
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /obj/machinery/vending/imported/nevada_iced_tea | ||
| name = "Nevada Lifetyle Vendor" | ||
|
|
||
| desc = "More than just the cheapest beverage at the konbeni, Nevada Beverage Limited has branched \ | ||
| out into a totalizing lifestyle brand. Caps, shirts, pants, shoes, and yes, even beverages can be \ | ||
| purchased at this machine." | ||
| icon_state = "nevada_vendor" | ||
| panel_type = "panel_nevada" | ||
| light_mask = "nevada_vendor-light-mask" | ||
| light_color = LIGHT_COLOR_ELECTRIC_CYAN | ||
| product_slogans = "I love tall boys!;Naturally refreshing!;Get it by the jug!" | ||
| product_categories = list( | ||
| list( | ||
| "name" = "Beverages", | ||
| "icon" = "champagne-glasses", | ||
| "products" = list( | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea = 10, | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/bottle = 5, | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/jug = 3, | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/blueberry = 8, | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/raspberry = 8, | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/lemonade = 8, | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/lemonade/bottle = 3, | ||
| /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea/preworkout = 3, | ||
| ), | ||
| ), | ||
| list( | ||
| "name" = "Merch", | ||
| "icon" = "shirt", | ||
| "products" = list( | ||
| /obj/item/clothing/under/nevada_uniform = 8, | ||
| /obj/item/clothing/shoes/nevada_kicks = 8, | ||
| /obj/item/clothing/head/nevada_cap = 8, | ||
| ), | ||
| ), | ||
| ) | ||
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
...and on that note...
...do all of these have crushed can icon states? cause otherwise iirc the crushed cans will be invisible
though that may need a few non-modular edits to make it use a modular icon file for the crushed cans
https://github.com/DopplerShift13/DopplerShift/blob/master/code/modules/reagents/reagent_containers/cups/soda.dm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is just deadly not making crushed states and me not getting to that yet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cool cool