diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 40ebeb09d0..714ff96b58 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1526,45 +1526,97 @@ datum color = "#888888" overdose = 5 - crayon_dust/red - name = "Red crayon dust" - id = "crayon_dust_red" - color = "#DA0000" + red + name = "Red crayon dust" + id = "crayon_dust_red" + color = "#FE191A" - crayon_dust/orange - name = "Orange crayon dust" - id = "crayon_dust_orange" - color = "#FF9300" + orange + name = "Orange crayon dust" + id = "crayon_dust_orange" + color = "#FFBE4F" - crayon_dust/yellow - name = "Yellow crayon dust" - id = "crayon_dust_yellow" - color = "#FFF200" + yellow + name = "Yellow crayon dust" + id = "crayon_dust_yellow" + color = "#FDFE7D" - crayon_dust/green - name = "Green crayon dust" - id = "crayon_dust_green" - color = "#A8E61D" + green + name = "Green crayon dust" + id = "crayon_dust_green" + color = "#18A31A" - crayon_dust/blue - name = "Blue crayon dust" - id = "crayon_dust_blue" - color = "#00B7EF" + blue + name = "Blue crayon dust" + id = "crayon_dust_blue" + color = "#247CFF" - crayon_dust/purple - name = "Purple crayon dust" - id = "crayon_dust_purple" - color = "#DA00FF" + purple + name = "Purple crayon dust" + id = "crayon_dust_purple" + color = "#CC0099" - crayon_dust/grey - name = "Grey crayon dust" - id = "crayon_dust_grey" + grey //Mime + name = "Grey crayon dust" + id = "crayon_dust_grey" + color = "#808080" + + brown //Rainbow + name = "Brown crayon dust" + id = "crayon_dust_brown" + color = "#846F35" + +//////////////////////////Paint////////////////////////////// + + paint + name = "Paint" + id = "paint" + description = "This paint will stick to almost any object" + reagent_state = LIQUID color = "#808080" + overdose = 15 + + //Paints corresponding to crayons are hardcoded + red + id = "paint_red" + color = "#FE191A" + + orange + id = "paint_orange" + color = "#FFBE4F" + + yellow + id = "paint_yellow" + color = "#FDFE7D" + + green + id = "paint_green" + color = "#18A31A" + + blue + id = "paint_blue" + color = "#247CFF" + + purple + id = "paint_purple" + color = "#CC0099" + + grey //Mime + id = "paint_grey" + color = "#808080" + + brown //Rainbow + id = "paint_brown" + color = "#846F35" + + black + id = "paint_black" + color = "#333333" + + white + id = "paint_white" + color = "#F0F8FF" - crayon_dust/brown - name = "Brown crayon dust" - id = "crayon_dust_brown" - color = "#846F35" //////////////////////////Poison stuff/////////////////////// diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 96b925674d..2aaaeec2fc 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1344,6 +1344,89 @@ datum var/obj/effect/golemrune/Z = new /obj/effect/golemrune Z.loc = get_turf(holder.my_atom) Z.announce_to_ghosts() + +//////////////////////////////////////////PAINT/////////////////////////////////////////// +//Crayon dust -> paint + red_paint + name = "Red paint" + id = "red_paint" + result = "paint_red" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_red" = 1) + result_amount = 5 + + orange_paint + name = "Orange paint" + id = "orange_paint" + result = "paint_orange" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_orange" = 1) + result_amount = 5 + + yellow_paint + name = "Yellow paint" + id = "yellow_paint" + result = "paint_yellow" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_yellow" = 1) + result_amount = 5 + + green_paint + name = "Green paint" + id = "green_paint" + result = "paint_green" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_green" = 1) + result_amount = 5 + + blue_paint + name = "Blue paint" + id = "blue_paint" + result = "paint_blue" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_blue" = 1) + result_amount = 5 + + purple_paint + name = "Purple paint" + id = "purple_paint" + result = "paint_purple" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_purple" = 1) + result_amount = 5 + + grey_paint + name = "Grey paint" + id = "grey_paint" + result = "paint_grey" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_grey" = 1) + result_amount = 5 + + brown_paint + name = "Brown paint" + id = "brown_paint" + result = "paint_brown" + required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_brown" = 1) + result_amount = 5 + +//Ghetto reactions + + blood_paint + name = "Blood paint" + id = "blood_paint" + result = "paint_red" + required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2) + result_amount = 5 + + milk_paint + name = "Milk paint" + id = "milk_paint" + result = "paint_white" + required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5) + result_amount = 5 + + carbon_paint + name = "Carbon paint" + id = "carbon_paint" + result = "paint_black" + required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1) + result_amount = 5 + + //////////////////////////////////////////FOOD MIXTURES//////////////////////////////////// tofu