diff --git a/modular_doppler/clutter_objects/icons/janitor.dmi b/modular_doppler/clutter_objects/icons/janitor.dmi index a828170bb966cc..35ab5a2fbef234 100644 Binary files a/modular_doppler/clutter_objects/icons/janitor.dmi and b/modular_doppler/clutter_objects/icons/janitor.dmi differ diff --git a/modular_doppler/modular_cosmetics/code/head/hats.dm b/modular_doppler/modular_cosmetics/code/head/hats.dm index aa4a1a7c23d976..3cd7a8ac42f230 100644 --- a/modular_doppler/modular_cosmetics/code/head/hats.dm +++ b/modular_doppler/modular_cosmetics/code/head/hats.dm @@ -52,3 +52,10 @@ greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#C5D4F3#ECF1F8" flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/head/nevada_cap + name = "\improper Nevada Beverage Co. cap" + desc = "A branded fitted cap, bearing the emblazoned logo of Nevada Beverage Co." + icon = 'modular_doppler/modular_cosmetics/icons/obj/head/hats.dmi' + icon_state = "nevada_hat" + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/hats.dmi' diff --git a/modular_doppler/modular_cosmetics/code/shoes/shoe.dm b/modular_doppler/modular_cosmetics/code/shoes/shoe.dm new file mode 100644 index 00000000000000..0465de53b08f86 --- /dev/null +++ b/modular_doppler/modular_cosmetics/code/shoes/shoe.dm @@ -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' diff --git a/modular_doppler/modular_cosmetics/code/under/miscellania.dm b/modular_doppler/modular_cosmetics/code/under/miscellania.dm index dbd822f135284a..b2e43b09b07c5c 100644 --- a/modular_doppler/modular_cosmetics/code/under/miscellania.dm +++ b/modular_doppler/modular_cosmetics/code/under/miscellania.dm @@ -115,3 +115,13 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON can_adjust = TRUE alt_covers_chest = TRUE + +/obj/item/clothing/under/nevada_uniform + name = "\improper Nevada Beverage Co. uniform" + desc = "A comfortable paired set of a branded ThermoWick™ fabric henley and relaxed khaki joggers. For Nevada employees, \ + and Nevada diehards." + icon = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi' + icon_state = "nevada_uniform" + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi' + female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS + can_adjust = FALSE diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/hats.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/hats.dmi index fc7c65c96441aa..cd1f406f6ee0a7 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/head/hats.dmi and b/modular_doppler/modular_cosmetics/icons/mob/head/hats.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi b/modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi index b666863b2c0fe7..daefa8b00e91a8 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi and b/modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi b/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi index 9a60b4d9975bd5..3277fa67f0d529 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi and b/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/head/hats.dmi b/modular_doppler/modular_cosmetics/icons/obj/head/hats.dmi index 8d3f252786ea4e..707c4f8f1b1bb3 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/head/hats.dmi and b/modular_doppler/modular_cosmetics/icons/obj/head/hats.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi b/modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi index b5bbfdab7efdd7..885f4083e2a9cd 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi and b/modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi b/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi index 2018d7625b9c12..daf606afadee60 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi and b/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi differ diff --git a/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drink_reagents.dm b/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drink_reagents.dm index 65024b0dc9bd92..c6bb084514846e 100644 --- a/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drink_reagents.dm +++ b/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drink_reagents.dm @@ -115,3 +115,9 @@ need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, 1 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) if(need_mob_update) return UPDATE_MOB_HEALTH + +/datum/reagent/consumable/berryjuice/blueberry + name = "Blueberry Juice" + description = "A delicious juicing of one particular kind of berry." + color = "#4c3cd8" + taste_description = "blueberries" diff --git a/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drinks.dm b/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drinks.dm index e52eff45dd9f30..418b807d536ada 100644 --- a/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drinks.dm +++ b/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/drinks.dm @@ -7,6 +7,8 @@ icon = 'modular_doppler/modular_food_drinks_and_chems/icons/drinks.dmi' icon_state = null +/// overrides a couple of can procs so it produces a modular trash item +/// for smashing it on our head /obj/item/reagent_containers/cup/soda_cans/doppler/attack(mob/M, mob/living/user) if(istype(M, /mob/living/carbon) && !reagents.total_volume && user.combat_mode && user.zone_selected == BODY_ZONE_HEAD) if(M == user) @@ -20,6 +22,7 @@ return TRUE . = ..() +/// for shooting it /obj/item/reagent_containers/cup/soda_cans/doppler/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE) . = ..() @@ -34,14 +37,7 @@ qdel(src) return -/** - * Burst the soda open on someone. Fun! Opens and empties the soda can, but does not crush it. - * - * Arguments: - * * target - Who's getting covered in soda - * * hide_message - Stops the generic fizzing message, so you can do your own - */ - +/// for throwing it at people /obj/item/reagent_containers/cup/soda_cans/doppler/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() if(. || spillable || !reagents.total_volume) // if it was caught, already opened, or has nothing in it diff --git a/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/nevada_company_drinks.dm b/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/nevada_company_drinks.dm new file mode 100644 index 00000000000000..936e4444afda80 --- /dev/null +++ b/modular_doppler/modular_food_drinks_and_chems/food_and_drinks/nevada_company_drinks.dm @@ -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 + 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) diff --git a/modular_doppler/modular_food_drinks_and_chems/icons/drinks.dmi b/modular_doppler/modular_food_drinks_and_chems/icons/drinks.dmi index 0b1eaf31cf5716..18aa98742625b1 100644 Binary files a/modular_doppler/modular_food_drinks_and_chems/icons/drinks.dmi and b/modular_doppler/modular_food_drinks_and_chems/icons/drinks.dmi differ diff --git a/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendor_snacks.dm b/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendor_snacks.dm index 874b3a9228f059..f654e18bb5692e 100644 --- a/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendor_snacks.dm +++ b/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendor_snacks.dm @@ -247,16 +247,6 @@ list_reagents = list(/datum/reagent/consumable/yogurt_soda = 30) drink_type = DAIRY -/obj/item/reagent_containers/cup/soda_cans/doppler/nevada_tea - name = "\improper Nevada green tea" - desc = "A staple item of fuel stations, bodegas, convenience stores, and checkout aisle coolers. Cheaper than water, \ - yet begging the question why." - icon = 'modular_doppler/modular_vending/icons/imported_quick_foods.dmi' - icon_state = "nevada_can" - volume = 60 - list_reagents = list(/datum/reagent/consumable/icetea = 50, /datum/reagent/consumable/honey = 10) - custom_price = PAYCHECK_LOWER - /obj/item/reagent_containers/cup/soda_cans/doppler/gakster_energy name = "\improper Gakster Energy™" desc = "First courting outrage over its commercialization of a cultural locii known to most by way of live combat footage and darkweb \ diff --git a/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendors.dm b/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendors.dm index 64df8b5f5e2e0a..831fed080c92fc 100644 --- a/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendors.dm +++ b/modular_doppler/modular_vending/code/doppler_vendors/imported_vendors/vendors.dm @@ -5,6 +5,7 @@ /obj/machinery/vending/imported/tiziran, /obj/machinery/vending/imported/marsian, /obj/machinery/vending/deforest_medvend, + /obj/machinery/vending/imported/nevada_iced_tea, ) /obj/effect/spawner/random/vending/colavend //These can serve both snacks AND drinks so it's kinda both of them? @@ -14,6 +15,7 @@ /obj/machinery/vending/imported/tiziran, /obj/machinery/vending/imported/marsian, /obj/machinery/vending/deforest_medvend, + /obj/machinery/vending/imported/nevada_iced_tea, ) /datum/supply_pack/vending/imported/fill(obj/structure/closet/crate/target_crate) diff --git a/modular_doppler/modular_vending/code/doppler_vendors/nevada_iced_tea/nevada_machine.dm b/modular_doppler/modular_vending/code/doppler_vendors/nevada_iced_tea/nevada_machine.dm new file mode 100644 index 00000000000000..acb6fec5e3063c --- /dev/null +++ b/modular_doppler/modular_vending/code/doppler_vendors/nevada_iced_tea/nevada_machine.dm @@ -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, + ), + ), + ) diff --git a/modular_doppler/modular_vending/icons/imported_quick_foods.dmi b/modular_doppler/modular_vending/icons/imported_quick_foods.dmi index 01450925b936f4..e21b5dd9b036bd 100644 Binary files a/modular_doppler/modular_vending/icons/imported_quick_foods.dmi and b/modular_doppler/modular_vending/icons/imported_quick_foods.dmi differ diff --git a/modular_doppler/modular_vending/icons/imported_vendors.dmi b/modular_doppler/modular_vending/icons/imported_vendors.dmi index 65ee132e1e6183..5620628d77e12c 100644 Binary files a/modular_doppler/modular_vending/icons/imported_vendors.dmi and b/modular_doppler/modular_vending/icons/imported_vendors.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 95865969adc03c..eefb278d724bc4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7157,6 +7157,7 @@ #include "modular_doppler\modular_cosmetics\code\shoes\gags_shoes.dm" #include "modular_doppler\modular_cosmetics\code\shoes\galoshes.dm" #include "modular_doppler\modular_cosmetics\code\shoes\rollerblades.dm" +#include "modular_doppler\modular_cosmetics\code\shoes\shoe.dm" #include "modular_doppler\modular_cosmetics\code\shoes\wheelys.dm" #include "modular_doppler\modular_cosmetics\code\shoes\workshoes.dm" #include "modular_doppler\modular_cosmetics\code\storage\backpacks.dm" @@ -7329,6 +7330,7 @@ #include "modular_doppler\modular_food_drinks_and_chems\food_and_drinks\drinks.dm" #include "modular_doppler\modular_food_drinks_and_chems\food_and_drinks\drinks_recipes.dm" #include "modular_doppler\modular_food_drinks_and_chems\food_and_drinks\hemophage_food.dm" +#include "modular_doppler\modular_food_drinks_and_chems\food_and_drinks\nevada_company_drinks.dm" #include "modular_doppler\modular_food_drinks_and_chems\food_and_drinks\datums\crafting\hemophage_recipes.dm" #include "modular_doppler\modular_hide_mutant_features\code\_defines.dm" #include "modular_doppler\modular_hide_mutant_features\code\bodypart_overlay.dm" @@ -7564,6 +7566,7 @@ #include "modular_doppler\modular_vending\code\doppler_vendors\imported_vendors\vendor_smokes.dm" #include "modular_doppler\modular_vending\code\doppler_vendors\imported_vendors\vendor_snacks.dm" #include "modular_doppler\modular_vending\code\doppler_vendors\imported_vendors\vendors.dm" +#include "modular_doppler\modular_vending\code\doppler_vendors\nevada_iced_tea\nevada_machine.dm" #include "modular_doppler\modular_vending\code\tg_vendors\autodrobe.dm" #include "modular_doppler\modular_vending\code\tg_vendors\boozeomat.dm" #include "modular_doppler\modular_vending\code\tg_vendors\clothesmate.dm"