Merge pull request #4838 from FalseIncarnate/paradise_pop

Paradise Pop

code/modules/reagents/newchem/paradise_pop.dm

@@ -0,0 +1,66 @@
+
+/*
+	Paradise Pop reagents
+	Created through the bottler machine via bottler_recipes, not through standard reactions
+	Eventually will have special effects (minor mostly) tied to their reagents, but for now are purely for flavor
+
+	Make sure to yell at me to finish giving them effects later
+	-FalseIncarnate
+*/
+
+
+//Paradise Punch: No effect, aside from maybe messages about how tasty it is or something
+/datum/reagent/paradise_punch
+	name = "Paradise Punch"
+	id = "paradise_punch"
+	description = "Tastes just how you'd think Paradise would if you could bottle it."
+	reagent_state = LIQUID
+	color = "#cc0044"
+
+//Apple-pocalypse: Low chance to cause a goonchem vortex that pulls things within a very small radius (2 tiles?) towards the drinker
+/datum/reagent/apple_pocalypse
+	name = "Apple-pocalypse"
+	id = "apple-pocalypse"
+	description = "If doomsday came in fruit form, it'd probably be apples."
+	reagent_state = LIQUID
+	color = "#44FF44"
+
+//Berry Banned: This one is tasty and safe to drink, might have a low chance of healing a random damage type?
+/datum/reagent/berry_banned
+	name = "Berry Banned"
+	id = "berry_banned"
+	description = "Reason for ban: Excessive Flavor."
+	reagent_state = LIQUID
+	color = "#FF44FF"
+
+//Berry Banned 2: This one is tasty and toxic. Deals toxin damage and MAYBE plays the "BWOINK!" sound if it kills someone?
+/datum/reagent/berry_banned2
+	name = "Berry Banned"
+	id = "berry_banned2"
+	description = "Reason for ban: Excessive Flavor."
+	reagent_state = LIQUID
+	color = "#FF44FF"
+
+//Blackeye Brew: Chance to make the drinker say greytider-themed things like "I thought clown was valid!"
+/datum/reagent/blackeye_brew
+	name = "Blackeye Brew"
+	id = "blackeye_brew"
+	description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
+	reagent_state = LIQUID
+	color = "#4d2600"
+
+//Grape Granade: causes the drinker to sometimes burp, has a low chance to cause a goonchem vortex that pushes things within a very small radius (1-2 tiles) away from the drinker
+/datum/reagent/grape_granade
+	name = "Grape Granade"
+	id = "grape_granade"
+	description = "Exploding with grape flavor and a favorite among ERT members system-wide."
+	reagent_state = LIQUID
+	color = "#9933ff"
+
+//Meteor Malt: Sometimes causes screen shakes for the drinker like a meteor impact, low chance to add 1-5 units of a random mineral reagent to the drinker's blood (iron, copper, silver, gold, uranium, carbon, etc)
+/datum/reagent/meteor_malt
+	name = "Meteor Malt"
+	id = "meteor_malt"
+	description = "Soft drinks have been detected on collision course with your tastebuds."
+	reagent_state = LIQUID
+	color = "#cc9900"

code/modules/reagents/reagent_containers/food/cans.dm

@@ -1,6 +1,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/cans
-	var canopened = 0
-	var is_glass = 0
+	var/canopened = 0
+	var/is_glass = 0
+	var/is_plastic = 0
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/New()
 	..()
@@ -16,6 +17,9 @@
 /obj/item/weapon/reagent_containers/food/drinks/cans/proc/crush(mob/user)
 	var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
 	crushed_can.icon_state = icon_state
+	//inherit material vars for recycling purposes
+	crushed_can.is_glass = is_glass
+	crushed_can.is_plastic = is_plastic
 	if(is_glass)
 		playsound(user.loc, 'sound/effects/Glassbr3.ogg', rand(10, 50), 1)
 		crushed_can.name = "broken bottle"
@@ -85,6 +89,7 @@
 	name = "Bottled Water"
 	desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."
 	icon_state = "waterbottle"
+	is_plastic = 1
 	New()
 		..()
 		reagents.add_reagent("water", 30)
@@ -259,3 +264,62 @@
 	New()
 		..()
 		reagents.add_reagent("synthanol", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler
+	name = "generic beverage container"
+	desc = "this shouldn't ever be spawned. shame on you"
+	icon_state = "glass_bottle"
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/on_reagent_change()
+	update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/pickup(mob/user)
+	..()
+	update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/dropped(mob/user)
+	..()
+	update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/attack_hand()
+	..()
+	update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/update_icon()
+	overlays.Cut()
+
+	if(reagents.total_volume)
+		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+
+		switch(round(reagents.total_volume))
+			if(0 to 9)
+				filling.icon_state = "[icon_state]-10"
+			if(10 to 19)
+				filling.icon_state = "[icon_state]10"
+			if(20 to 29)
+				filling.icon_state = "[icon_state]20"
+			if(30 to 39)
+				filling.icon_state = "[icon_state]30"
+			if(40 to 49)
+				filling.icon_state = "[icon_state]40"
+			if(50 to INFINITY)
+				filling.icon_state = "[icon_state]50"
+
+		filling.icon += mix_color_from_reagents(reagents.reagent_list)
+		overlays += filling
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/glass_bottle
+	name = "glass bottle"
+	desc = "A glass bottle suitable for beverages."
+	icon_state = "glass_bottle"
+	is_glass = 1
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+	name = "plastic bottle"
+	desc = "A plastic bottle suitable for beverages."
+	icon_state = "plastic_bottle"
+	is_plastic = 1
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/metal_can
+	name = "metal can"
+	desc = "A metal can suitable for beverages."
+	icon_state = "metal_can"

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -205,13 +205,20 @@
 
 		var/percent = round((reagents.total_volume / volume) * 100)
 		switch(percent)
-			if(0 to 9)		filling.icon_state = "[icon_state]-10"
-			if(10 to 24) 	filling.icon_state = "[icon_state]10"
-			if(25 to 49)	filling.icon_state = "[icon_state]25"
-			if(50 to 74)	filling.icon_state = "[icon_state]50"
-			if(75 to 79)	filling.icon_state = "[icon_state]75"
-			if(80 to 90)	filling.icon_state = "[icon_state]80"
-			if(91 to INFINITY)	filling.icon_state = "[icon_state]100"
+			if(0 to 9)
+				filling.icon_state = "[icon_state]-10"
+			if(10 to 24)
+				filling.icon_state = "[icon_state]10"
+			if(25 to 49)
+				filling.icon_state = "[icon_state]25"
+			if(50 to 74)
+				filling.icon_state = "[icon_state]50"
+			if(75 to 79)
+				filling.icon_state = "[icon_state]75"
+			if(80 to 90)
+				filling.icon_state = "[icon_state]80"
+			if(91 to INFINITY)
+				filling.icon_state = "[icon_state]100"
 
 		filling.icon += mix_color_from_reagents(reagents.reagent_list)
 		overlays += filling