Merge pull request #25 from Alphas00/master

GS13 plants fix & ported GS13 drink icons fix

GainStation13/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -0,0 +1,13 @@
+/datum/reagent/consumable
+	var/use_gs_icon = FALSE
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
+	icon = 'icons/obj/drinks.dmi'
+	if(reagents.reagent_list.len)
+		var/datum/reagent/R = reagents.get_master_reagent()
+		if(istype(R, /datum/reagent/consumable))
+			var/datum/reagent/consumable/C = R
+			if(C.use_gs_icon == TRUE)
+				icon = 'GainStation13/icons/obj/drinks.dmi'
+
+	..()

GainStation13/code/modules/hydroponics/grown/berries.dm

@@ -1,7 +1,6 @@
 /obj/item/seeds/berry/blueberry
 	name = "pack of blueberry seeds"
 	desc = "These seeds grow into blueberry bushes."
-	icon_state = "seed-blueberry"
 	species = "blueberry"
 	plantname = "Blueberry Bush"
 	product = /obj/item/reagent_containers/food/snacks/grown/berries/blueberry
@@ -11,11 +10,18 @@
 	yield = 1
 	production = 10
 	rarity = 30
+	icon = 'GainStation13/icons/obj/hydroponics/seeds.dmi'
+	icon_state = "seed-blueberry"
+	growing_icon = 'GainStation13/icons/obj/hydroponics/growing.dmi'
+	icon_grow = "berry-grow" // Uses one growth icons set for all the subtypes
+	icon_dead = "berry-dead" // Same for the dead icon
+	icon_harvest = "blueberry-harvest"
 
 /obj/item/reagent_containers/food/snacks/grown/berries/blueberry
 	seed = /obj/item/seeds/berry/blueberry
 	name = "bunch of blueberries"
 	desc = "Taste so good, you might turn blue!"
+	icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "blueberrypile"
 	filling_color = "#5d00c7"
 	foodtype = FRUIT

GainStation13/code/modules/hydroponics/lipoplant.dm

@@ -1,8 +1,6 @@
 /obj/item/seeds/lipoplant
 	name = "pack of adipolipus"
 	desc = "These seeds grow into a foreign plant."
-	icon = 'GainStation13/icons/obj/hydroponics/lipo_seeds.dmi'
-	icon_state = "lipo_seed"
 	species = "adipolipus"
 	plantname = "Adipolipus"
 	product = /obj/item/reagent_containers/food/snacks/grown/lipofruit
@@ -11,17 +9,19 @@
 	maturation = 8
 	production = 5
 	yield = 1
-	growing_icon = 'GainStation13/icons/obj/hydroponics/lipo_growing.dmi'
+	reagents_add = list(/datum/reagent/consumable/lipoifier = 0.05)
+	icon = 'GainStation13/icons/obj/hydroponics/seeds.dmi'
+	icon_state = "seed-lipo"
+	growing_icon = 'GainStation13/icons/obj/hydroponics/growing.dmi'
 	icon_grow = "lipo-grow" // Uses one growth icons set for all the subtypes
 	icon_dead = "lipo-dead" // Same for the dead icon
 	icon_harvest = "lipo-harvest"
-	reagents_add = list(/datum/reagent/consumable/lipoifier = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/lipofruit
 	seed = /obj/item/seeds/lipoplant
 	name = "lipofruit"
 	desc = "A foreign fruit with an hard shell. Perhaps something sharp could open it?"
-	icon = 'GainStation13/icons/obj/hydroponics/lipo_harvest.dmi'
+	icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "lipo_nut"
 	item_state = "lipo_nut"
 	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)

GainStation13/code/modules/hydroponics/munchies_weed.dm

@@ -8,22 +8,26 @@
 /obj/item/seeds/cannabis/munchies
 	name = "pack of munchies weed seeds"
 	desc = "These seeds grow into munchies weed."
-	icon_state = "seed-munchies"
 	species = "munchycannabis"
 	plantname = "Munchies Weed"
-	icon_grow = "munchycannabis-grow" // Uses one growth icons set for all the subtypes
-	icon_dead = "munchycannabis-dead" // Same for the dead icon
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/munchies
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/orange)
 	mutatelist = list()
 	reagents_add = list(/datum/reagent/drug/space_drugs = 0.05,
 						/datum/reagent/drug/munchies = 0.10)
 	rarity = 69
+	icon = 'GainStation13/icons/obj/hydroponics/seeds.dmi'
+	icon_state = "seed-munchies"
+	growing_icon = 'GainStation13/icons/obj/hydroponics/growing.dmi'
+	icon_grow = "munchycannabis-grow" // Uses one growth icons set for all the subtypes
+	icon_dead = "munchycannabis-dead" // Same for the dead icon
+	icon_harvest = "munchycannabis-harvest"
 
 /obj/item/reagent_containers/food/snacks/grown/cannabis/munchies
 	seed = /obj/item/seeds/cannabis/munchies
 	name = "munchies cannabis leaf"
 	desc = "You feel hungry just looking at it."
+	icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "munchycannabis"
 	wine_power = 90
 

GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm

@@ -13,6 +13,7 @@
 	shot_glass_icon_state = "shotglassbrown"
 	pH = 4.5
 	value = 0.1
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/glyphid_slammer
 	name = "Glyphid slammer"
@@ -26,3 +27,4 @@
 	shot_glass_icon_state = "shotglassbrown"
 	pH = 4.5
 	value = 0.1
+	use_gs_icon = TRUE

GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm

@@ -11,6 +11,7 @@
 	glass_name = "belly bloats"
 	glass_desc = "The perfect mix to be big and merry with."
 	shot_glass_icon_state = "shotglassbrown"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/belly_bloats/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -30,6 +31,7 @@
 	glass_name = "blobby mary"
 	glass_desc = "For the morbidly obese ladies and gentlemen."
 	shot_glass_icon_state = "shotglassred"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/blobby_mary/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -49,6 +51,7 @@
 	glass_name = "beltbuster mead"
 	glass_desc = "The ambrosia of the blubbery gods."
 	shot_glass_icon_state = "shotglassgold"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/beltbuster_mead/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -67,6 +70,7 @@
 	glass_name = "heavy cafe"
 	glass_desc = "To enjoy slow mornings with."
 	shot_glass_icon_state = "shotglassbrown"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/heavy_cafe/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -92,6 +96,7 @@
 	glass_name = "fruits tea"
 	glass_desc = "Goes down really easy and stays there for a long time."
 	shot_glass_icon_state = "shotglassgold"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/fruits_tea/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-2)
@@ -118,6 +123,7 @@
 	glass_name = "snakebite"
 	glass_desc = "Won't hurt like a real bite, but you'll still regert drinking this."
 	shot_glass_icon_state = "shotglassgreen"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/snakebite/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13

tgstation.dme

@@ -3996,6 +3996,7 @@
 #include "GainStation13\code\modules\food_and_drinks\drinks.dm"
 #include "GainStation13\code\modules\food_and_drinks\food.dm"
 #include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm"
+#include "GainStation13\code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm"
 #include "GainStation13\code\modules\food_and_drinks\objects\boxes.dm"
 #include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm"
 #include "GainStation13\code\modules\food_and_drinks\recipes\recipes_ported.dm"