Nevada Beverage Co. Official Doppler Shift Endorsement#849
Nevada Beverage Co. Official Doppler Shift Endorsement#849kittysmooch wants to merge 6 commits intoDopplerShift13:masterfrom
Conversation
github-actions
bot
added
Sprites
| @@ -0,0 +1,35 @@ | |||
| /obj/machinery/vending/imported/nevada_iced_tea | |||
| name = "Nevada Lifetyle Vendor" | |||
| 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 |
There was a problem hiding this comment.
then don't do it
probably none of these should be subtypes of /obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea each other, given they inherit... nothing meaningful
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...
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
| /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 |
There was a problem hiding this comment.
...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.
this is just deadly not making crushed states and me not getting to that yet
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
2 participants
About The Pull Request
Expands the offerings from Nevada bevco with a bunch of sprites by DeadlyToy.
Why It's Good For The Game
even more flavor items to stand us apart yay
Testing Evidence
currently a wip with a couple of icons to fix or edit
Changelog
🆑
add: Added new beverages and merch for Nevada Beverage Company.
🆑