diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 2d9f5eb7c56..8c6e6ffb8e3 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -88,6 +88,7 @@ /obj/item/reagent_containers/food/drinks/bottle/cola = 5, /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, /obj/item/reagent_containers/food/drinks/bottle/space_up = 5, + /obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda = 2, /obj/item/reagent_containers/food/drinks/cans/adhomai_milk = 2, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 6, /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2, @@ -331,7 +332,8 @@ /obj/item/reagent_containers/food/drinks/cans/iced_tea = 10, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 10, /obj/item/reagent_containers/food/drinks/cans/koispunch = 5, - /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 10 + /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 10, + /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 10 ) contraband = list( /obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5, @@ -354,7 +356,8 @@ /obj/item/reagent_containers/food/drinks/cans/iced_tea = 13, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 16, /obj/item/reagent_containers/food/drinks/cans/koispunch = 50, - /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5 + /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5, + /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 35 ) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = 'sound/machines/vending/vending_cans.ogg' diff --git a/code/game/objects/items/weapons/storage/field_ration.dm b/code/game/objects/items/weapons/storage/field_ration.dm index ef747a60675..5efd16acfca 100644 --- a/code/game/objects/items/weapons/storage/field_ration.dm +++ b/code/game/objects/items/weapons/storage/field_ration.dm @@ -30,7 +30,7 @@ if("NanoTrasen Sponsored") new /obj/item/reagent_containers/food/snacks/liquidfood(src) new /obj/item/reagent_containers/food/snacks/liquidfood(src) - new /obj/item/reagent_containers/food/drinks/cans/sodawater(src) + new /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda(src) desc += " This one has the NanoTrasen logo." /obj/item/storage/field_ration/army diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index 454a4ca1cd0..acd77c29f99 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -116,7 +116,7 @@ desc_fluff = "The Party of the Free Tajara under the Leadership of Hadii is the only and ruling party in the PRA, with its leader always being the elected president. \ They follow Hadiism as their main ideology, with the objective of securing the tajaran freedom and place in the galactic community. Membership of the Hadiist Party is not open. \ For anyone to become a member, they must be approved by a committee that will consider their qualifications and past. Goverment officials can grant honorary memberships, this is \ - seem as nothing but a honor and does not grant any status or position that a regular Party member would have." + seen as nothing but a honor and does not grant any status or position that a regular Party member would have." w_class = ITEMSIZE_TINY flippable = TRUE v_flippable = FALSE diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index b8d3c53d3a1..e7c15cd9a68 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -4513,6 +4513,19 @@ M.dizziness += 5 M.drowsyness = 0 +/decl/reagent/drink/hrozamal_soda + name = "Hro'zamal Soda" + description = "A cabornated version of the herbal tea made with Hro'zamal Ras'Nifs powder." + color = "#F0C56C" + adj_sleepy = -1 + caffeine = 0.2 + taste_description = "carbonated fruit sweetness" + carbonated = TRUE + + glass_icon_state = "hrozamal_soda_glass" + glass_name = "glass of Hro'zamal Soda" + glass_desc = "A cabornated version of the herbal tea made with Hro'zamal Ras'Nifs powder." + /decl/reagent/nutriment/pumpkinpulp name = "Pumpkin Pulp" description = "The gooey insides of a slain pumpkin. This day is the greatest..." diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index b120b33bba4..5e553e7efb8 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -451,3 +451,14 @@ icon_state = "three_towns_cider" center_of_mass = list("x"=16, "y"=10) reagents_to_add = list(/decl/reagent/alcohol/butanol/threetownscider = 30) + +/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda + name = "Hro'zamal Soda" + desc = "A can of Hro'zamal Soda. Made with Hro'zamal Ras'Nifs powder and canned in the People's Republic of Adhomai." + desc_fluff = "Hro'zamal Soda is a soft drink made from the seed's powder of a plant native to Hro'zamal, the sole Hadiist colony. While initially consumed as a herbal tea by the \ + colonists, it was introduced to Adhomai by the Army Expeditionary Force and transformed into a carbonated drink. The beverage is popular with factory workers and university \ + students because of its stimulant effect." + icon_state = "hrozamal_soda_can" + center_of_mass = list("x"=16, "y"=10) + + reagents_to_add = list(/decl/reagent/drink/hrozamal_soda = 30) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 02088c8e9c5..92f2b8c67f9 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -433,6 +433,17 @@ shatter_material = MATERIAL_PLASTIC fragile = 0 +/obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda + name = "Hro'zamal Soda" + desc = "A bottle of Hro'zamal Soda. Made with Hro'zamal Ras'Nifs powder and bottled in the People's Republic of Adhomai." + desc_fluff = "Hro'zamal Soda is a soft drink made from the seed's powder of a plant native to Hro'zamal, the sole Hadiist colony. While initially consumed as a herbal tea by the \ + colonists, it was introduced to Adhomai by the Army Expeditionary Force and transformed into a carbonated drink. The beverage is popular with factory workers and university \ + students because of its stimulant effect." + icon_state = "hrozamal_soda_bottle" + center_of_mass = list("x"=16, "y"=5) + reagents_to_add = list(/decl/reagent/drink/hrozamal_soda = 100) + fragile = FALSE + /obj/item/reagent_containers/food/drinks/bottle/pwine name = "Chip Getmore's Velvet" desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 3bc5d79c334..7d014a7a29b 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -65,7 +65,8 @@ var/list/lunchables_drinks_ = list( /obj/item/reagent_containers/food/drinks/cans/tonic, /obj/item/reagent_containers/food/drinks/cans/sodawater, /obj/item/reagent_containers/food/drinks/cans/adhomai_milk, - /obj/item/reagent_containers/food/drinks/cans/beetle_milk + /obj/item/reagent_containers/food/drinks/cans/beetle_milk, + /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda ) // This default list is a bit different, it contains items we don't want diff --git a/html/changelogs/alberyk-hadiisoda.yml b/html/changelogs/alberyk-hadiisoda.yml new file mode 100644 index 00000000000..b7def95caf4 --- /dev/null +++ b/html/changelogs/alberyk-hadiisoda.yml @@ -0,0 +1,6 @@ +author: Alberyk, Canon35 + +delete-after: True + +changes: + - rscadd: "Added Hro'zamal Soda." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 7c179100063..aec5517b34c 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/drinks_empty.dmi b/icons/obj/drinks_empty.dmi index 5f314f5f04d..76893ee7466 100644 Binary files a/icons/obj/drinks_empty.dmi and b/icons/obj/drinks_empty.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index e5ef1b352cb..b61c42c10e3 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ