Merge pull request #14534 from Heroman3003/art-paint-stuff

Adjusts artistic crate orders

code/datums/supplypacks/recreation.dm

@@ -72,15 +72,16 @@
 			/obj/item/device/camera_film = 2,
 			/obj/item/weapon/storage/photo_album,
 			/obj/item/weapon/packageWrap,
-			/obj/item/weapon/reagent_containers/glass/paint/red,
-			/obj/item/weapon/reagent_containers/glass/paint/green,
-			/obj/item/weapon/reagent_containers/glass/paint/blue,
-			/obj/item/weapon/reagent_containers/glass/paint/yellow,
-			/obj/item/weapon/reagent_containers/glass/paint/purple,
-			/obj/item/weapon/reagent_containers/glass/paint/black,
-			/obj/item/weapon/reagent_containers/glass/paint/white,
 			/obj/item/poster/custom,
-			/obj/item/weapon/wrapping_paper = 3
+			/obj/item/weapon/wrapping_paper = 3,
+			/obj/structure/easel,
+			/obj/item/paint_brush,
+			/obj/item/paint_palette,
+			/obj/item/canvas = 3,
+			/obj/item/canvas/nineteen_nineteen = 2,
+			/obj/item/canvas/twentythree_nineteen = 2,
+			/obj/item/canvas/twentythree_twentythree = 2,
+			/obj/item/canvas/twentyfour_twentyfour = 2
 			)
 	cost = 10
 	containertype = /obj/structure/closet/crate/allico
@@ -94,7 +95,17 @@
 	contains = list(
 			/obj/item/device/pipe_painter = 2,
 			/obj/item/device/floor_painter = 2,
-			///obj/item/device/closet_painter = 2
+			/obj/item/weapon/reagent_containers/glass/paint/red,
+			/obj/item/weapon/reagent_containers/glass/paint/green,
+			/obj/item/weapon/reagent_containers/glass/paint/blue,
+			/obj/item/weapon/reagent_containers/glass/paint/yellow,
+			/obj/item/weapon/reagent_containers/glass/paint/violet,
+			/obj/item/weapon/reagent_containers/glass/paint/cyan,
+			/obj/item/weapon/reagent_containers/glass/paint/orange,
+			/obj/item/weapon/reagent_containers/glass/paint/purple,
+			/obj/item/weapon/reagent_containers/glass/paint/grey,
+			/obj/item/weapon/reagent_containers/glass/paint/black,
+			/obj/item/weapon/reagent_containers/glass/paint/white = 3
 			)
 
 /datum/supply_pack/recreation/cheapbait

code/game/objects/items/weapons/paint.dm

@@ -27,44 +27,52 @@ var/global/list/cached_icons = list()
 		return ..()
 
 /obj/item/weapon/reagent_containers/glass/paint/New()
-	if(paint_type && length(paint_type) > 0)
-		name = paint_type + " " + name
 	..()
-	reagents.add_reagent("water", volume*3/5)
-	reagents.add_reagent("plasticide", volume/5)
-	if(paint_type == "white") //why don't white crayons exist
-		reagents.add_reagent("aluminum", volume/5)
-	else if (paint_type == "black")
-		reagents.add_reagent("carbon", volume/5)
-	else
-		reagents.add_reagent("marker_ink_[paint_type]", volume/5)
-	reagents.handle_reactions()
+	if(paint_type)
+		reagents.add_reagent("paint", volume, paint_type)
 
 /obj/item/weapon/reagent_containers/glass/paint/red
 	icon_state = "paint_red"
-	paint_type = "red"
+	paint_type = "#FF0000"
 
 /obj/item/weapon/reagent_containers/glass/paint/yellow
 	icon_state = "paint_yellow"
-	paint_type = "yellow"
+	paint_type = "#FFFF00"
 
 /obj/item/weapon/reagent_containers/glass/paint/green
 	icon_state = "paint_green"
-	paint_type = "green"
+	paint_type = "#00FF00"
 
 /obj/item/weapon/reagent_containers/glass/paint/blue
 	icon_state = "paint_blue"
-	paint_type = "blue"
+	paint_type = "#0000FF"
 
-/obj/item/weapon/reagent_containers/glass/paint/purple
+/obj/item/weapon/reagent_containers/glass/paint/violet
 	icon_state = "paint_violet"
-	paint_type = "purple"
+	paint_type = "#FF00FF"
 
 /obj/item/weapon/reagent_containers/glass/paint/black
 	icon_state = "paint_black"
-	paint_type = "black"
+	paint_type = "#000000"
+
+/obj/item/weapon/reagent_containers/glass/paint/grey
+	icon_state = "paint_neutral"
+	paint_type = "#808080"
+
+/obj/item/weapon/reagent_containers/glass/paint/orange
+	icon_state = "paint_orange"
+	paint_type = "#FFA500"
+
+/obj/item/weapon/reagent_containers/glass/paint/purple
+	icon_state = "paint_purple"
+	paint_type = "#A500FF"
+
+/obj/item/weapon/reagent_containers/glass/paint/cyan
+	icon_state = "paint_cyan"
+	paint_type = "#00FFFF"
 
 /obj/item/weapon/reagent_containers/glass/paint/white
+	name = "paint remover bucket"
 	icon_state = "paint_white"
-	paint_type = "white"
+	paint_type = "#FFFFFF"
 

code/game/objects/structures/artstuff.dm

@@ -248,7 +248,7 @@
 	framed_offset_y = 6
 
 /obj/item/canvas/twentyfour_twentyfour
-	name = "ai universal standard canvas"
+	//name = "ai universal standard canvas"					// Uncomment this when AI can actually
 	//desc = "Besides being very large, the AI can accept these as a display from their internal database after you've hung it up." // Not yet
 	icon_state = "24x24"
 	width = 24