diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index ada7c7a06..8547e5117 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2439,15 +2439,3 @@ datum/reagent/consumable/ethanol/creme_de_coconut boozepwr = 65 taste_description = "viscous cream" glass_desc = "The name is probably exactly what it is." - -//Hope you're not a Russian T-90 -/datum/reagent/consumable/ethanol/javelin - name = "Javelin Cocktail" - boozepwr = 80 - color = "#F54F10" - quality = DRINK_FANTASTIC - taste_description = "explosive fireballs" - glass_icon_state = "javelin" - shot_glass_icon_state = "javelin_warhead" - glass_name = "Javelin Cocktail" - glass_desc = "A man-portable, delicious glass of justice." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 8ed38e686..2cb562cff 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -1002,12 +1002,4 @@ glass_name = "Orange Creamsicle" hydration = 4 -/datum/reagent/consumable/kalynajuice - name = "Red Kalyna Juice" - description = "Juice from Kalyna plants." - color = "#E90501" // rgb: 233, 5, 1 - taste_description = "sweet cranberries" - glass_icon_state = "kalyna" - glass_name = "glass of red kalyna juice" - glass_desc = "A vibrantly red juice!" - hydration = 4 + diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 452aeb774..5b87fd02d 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -47,7 +47,7 @@ /obj/item/seeds/watermelon = 3, /obj/item/seeds/wheat = 3, /obj/item/seeds/whitebeet = 3, - /obj/item/seed/kalyna = 3) + /obj/item/seeds/kalyna = 3) //Hyperstation addition contraband=list(/obj/item/seeds/amanita = 2, /obj/item/seeds/glowshroom = 2, diff --git a/code/modules/hydroponics/grown/kalyna.dm b/hyperstation/code/modules/hydroponics/grown/kalyna.dm similarity index 90% rename from code/modules/hydroponics/grown/kalyna.dm rename to hyperstation/code/modules/hydroponics/grown/kalyna.dm index 139295ab7..55a681ab4 100644 --- a/code/modules/hydroponics/grown/kalyna.dm +++ b/hyperstation/code/modules/hydroponics/grown/kalyna.dm @@ -2,6 +2,7 @@ /obj/item/seeds/kalyna name = "pack of kalyna berry seeds" desc = "Seeds that grow into Kalyna plants. Take that Red Kalyna and rise it up." + icon = 'hyperstation/icons/obj/hydroponics/seeds.dmi' icon_state = "seed-kalyna" species = "kalyna" plantname = "Kalyna Shrub Tree" @@ -11,7 +12,7 @@ production = 5 growthstages = 5 yield = 4 - growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + growing_icon = 'hyperstation/icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "kalyna-grow" icon_dead = "kalyna-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -21,6 +22,7 @@ seed = /obj/item/seeds/kalyna name = "branch of kalyna" desc = "Red berries, attached to a branch. Just looking at it makes you feel an aura of unity." + icon = 'hyperstation/icons/obj/hydroponics/harvest.dmi' icon_state = "kalynaberries" gender = PLURAL filling_color = "#FF0000" @@ -35,4 +37,4 @@ //I know that this game should be for escapism, but there's only so much we should escape from. When people's lives are being upturned-- Or taken by a brutal invasive reigime, perhaps then it's when we should take a stand. //And for those that oppose the freedom of the people of Ukraine, Russia, and Belarus; Prykhyl'nyk Putina, idy na khuy. And show some basic empathy for once, it's not that hard. //Glory to Ukraine, Glory to the Heroes! -// - Arctaisia, Hyperstation developer and spriter, 23/04/2022 #StandWithUkraine \ No newline at end of file +// - Arctaisia, Hyperstation developer and spriter, 23/04/2022 #StandWithUkraine diff --git a/hyperstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/hyperstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm new file mode 100644 index 000000000..76805f825 --- /dev/null +++ b/hyperstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -0,0 +1,11 @@ +//Hope you're not a Russian T-90 +/datum/reagent/consumable/ethanol/javelin + name = "Javelin Cocktail" + boozepwr = 80 + color = "#F54F10" + quality = DRINK_FANTASTIC + taste_description = "explosive fireballs" + glass_icon_state = "javelin" + shot_glass_icon_state = "javelin_warhead" + glass_name = "Javelin Cocktail" + glass_desc = "A man-portable, delicious glass of justice." diff --git a/hyperstation/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/hyperstation/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 3656de158..3c088d34f 100644 --- a/hyperstation/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/hyperstation/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -21,3 +21,13 @@ if(holder.has_reagent(/datum/reagent/consumable/capsaicin)) holder.remove_reagent(/datum/reagent/consumable/capsaicin, 1) ..() + +/datum/reagent/consumable/kalynajuice + name = "Red Kalyna Juice" + description = "Juice from Kalyna plants." + color = "#E90501" // rgb: 233, 5, 1 + taste_description = "sweet cranberries" + glass_icon_state = "kalyna" + glass_name = "glass of red kalyna juice" + glass_desc = "A vibrantly red juice!" + hydration = 4 diff --git a/hyperstation/icons/obj/hydroponics/growing_fruits.dmi b/hyperstation/icons/obj/hydroponics/growing_fruits.dmi new file mode 100644 index 000000000..691f93859 Binary files /dev/null and b/hyperstation/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/hyperstation/icons/obj/hydroponics/harvest.dmi b/hyperstation/icons/obj/hydroponics/harvest.dmi new file mode 100644 index 000000000..5ba1d7501 Binary files /dev/null and b/hyperstation/icons/obj/hydroponics/harvest.dmi differ diff --git a/hyperstation/icons/obj/hydroponics/seeds.dmi b/hyperstation/icons/obj/hydroponics/seeds.dmi new file mode 100644 index 000000000..89c8a1f87 Binary files /dev/null and b/hyperstation/icons/obj/hydroponics/seeds.dmi differ diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index 8b05dcf6b..ba0761035 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 8de35ffaf..368b0e5c0 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 812f79cf1..be65d86d0 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 61fea1715..9ed36015b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1899,7 +1899,6 @@ #include "code\modules\hydroponics\grown\flowers.dm" #include "code\modules\hydroponics\grown\garlic.dm" #include "code\modules\hydroponics\grown\grass_carpet.dm" -#include "code\modules\hydroponics\grown\kalyna.dm" #include "code\modules\hydroponics\grown\kudzu.dm" #include "code\modules\hydroponics\grown\melon.dm" #include "code\modules\hydroponics\grown\misc.dm" @@ -3165,6 +3164,7 @@ #include "hyperstation\code\modules\events\crystalline_reentry.dm" #include "hyperstation\code\modules\events\crystalloid_entities.dm" #include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm" +#include "hyperstation\code\modules\hydroponics\grown\kalyna.dm" #include "hyperstation\code\modules\integrated_electronics\input.dm" #include "hyperstation\code\modules\jobs\job_types\roleplay.dm" #include "hyperstation\code\modules\mining\shelters.dm" @@ -3180,6 +3180,7 @@ #include "hyperstation\code\modules\power\reactor\fuel_rods.dm" #include "hyperstation\code\modules\power\reactor\rbmk.dm" #include "hyperstation\code\modules\power\reactor\reactor_cargo.dm" +#include "hyperstation\code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\drink_reagents.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\food_reagents.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\hydroponics_reactions.dm"