diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 2cbc12d3248..54ab1baca33 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2637,7 +2637,7 @@ datum name = "Carrot juice" id = "carrotjuice" description = "It is just like a carrot but without crunching." - color = "#973800" // rgb: 151, 56, 0 + color = "#FF8C00" // rgb: 255, 140, 0 glass_icon_state = "carrotjuice" glass_name = "glass of carrot juice" @@ -2707,7 +2707,7 @@ datum name = "Watermelon Juice" id = "watermelonjuice" description = "Delicious juice made from watermelon." - color = "#863333" // rgb: 134, 51, 51 + color = "#B83333" // rgb: 184, 51, 51 glass_icon_state = "glass_red" glass_name = "glass of watermelon juice" @@ -2717,7 +2717,7 @@ datum name = "Lemon Juice" id = "lemonjuice" description = "This juice is VERY sour." - color = "#863333" // rgb: 175, 175, 0 + color = "#AFAF00" // rgb: 175, 175, 0 glass_icon_state = "lemonjuice" glass_name = "glass of lemon juice" @@ -2727,7 +2727,7 @@ datum name = "Banana Juice" id = "banana" description = "The raw essence of a banana." - color = "#863333" // rgb: 175, 175, 0 + color = "#C3AF00" // rgb: 195, 175, 0 glass_icon_state = "banana" glass_name = "glass of banana juice" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 4d6b44fb84d..270551af927 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1414,14 +1414,17 @@ datum //Ghetto reactions +/* Ideally the paint should take on the blood's colour (for each of the species) + but I could not think of a way. - RKF + blood_paint name = "Blood paint" id = "blood_paint" result = "paint" - resultcolor = "#FE191A" + resultcolor = "#C80000" required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2) result_amount = 5 - +*/ milk_paint name = "Milk paint" id = "milk_paint" @@ -1430,6 +1433,96 @@ datum required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5) result_amount = 5 + orange_juice_paint + name = "Orange juice paint" + id = "orange_juice_paint" + result = "paint" + resultcolor = "#E78108" + required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5) + result_amount = 5 + + tomato_juice_paint + name = "Tomato juice paint" + id = "tomato_juice_paint" + result = "paint" + resultcolor = "#731008" + required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5) + result_amount = 5 + + lime_juice_paint + name = "Lime juice paint" + id = "lime_juice_paint" + result = "paint" + resultcolor = "#365E30" + required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5) + result_amount = 5 + + carrot_juice_paint + name = "Carrot juice paint" + id = "carrot_juice_paint" + result = "paint" + resultcolor = "#973800" + required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5) + result_amount = 5 + + berry_juice_paint + name = "Berry juice paint" + id = "berry_juice_paint" + result = "paint" + resultcolor = "#990066" + required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5) + result_amount = 5 + + grape_juice_paint + name = "Grape juice paint" + id = "grape_juice_paint" + result = "paint" + resultcolor = "#863333" + required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5) + result_amount = 5 + + poisonberry_juice_paint + name = "Poison berry juice paint" + id = "poisonberry_juice_paint" + result = "paint" + resultcolor = "#863353" + required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5) + result_amount = 5 + + watermelon_juice_paint + name = "Watermelon juice paint" + id = "watermelon_juice_paint" + result = "paint" + resultcolor = "#B83333" + required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5) + result_amount = 5 + + lemon_juice_paint + name = "Lemon juice paint" + id = "lemon_juice_paint" + result = "paint" + resultcolor = "#AFAF00" + required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5) + result_amount = 5 + + banana_juice_paint + name = "Banana juice paint" + id = "banana_juice_paint" + result = "paint" + resultcolor = "#C3AF00" + required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5) + result_amount = 5 + + potato_juice_paint + name = "Potato juice paint" + id = "potato_juice_paint" + result = "paint" + resultcolor = "#302000" + required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5) + result_amount = 5 + +//Other paint + carbon_paint name = "Carbon paint" id = "carbon_paint" @@ -1438,8 +1531,6 @@ datum required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1) result_amount = 5 -//Aluminum "non-ghetto" white paint - aluminum_paint name = "Aluminum paint" id = "aluminum_paint"