diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 8b3ec34872..a7610bfca2 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -887,7 +887,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /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/purple, /obj/item/weapon/reagent_containers/glass/paint/black, /obj/item/weapon/reagent_containers/glass/paint/white, /obj/item/weapon/contraband/poster, diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index fe9945f8f0..a058a8e0a2 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -19,6 +19,9 @@ /turf/proc/clean(atom/source) if(source.reagents.has_reagent("water", 1)) clean_blood() + if(istype(src, /turf)) + var/turf/L = src + L.color = initial(L.color) //paint if(istype(src, /turf/simulated)) var/turf/simulated/T = src T.dirt = 0 diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 5373616508..77f8172f8f 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -36,6 +36,8 @@ var/global/list/cached_icons = list() 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("crayon_dust_[paint_type]", volume/5) reagents.handle_reactions() @@ -56,13 +58,13 @@ var/global/list/cached_icons = list() icon_state = "paint_blue" paint_type = "blue" - violet + purple icon_state = "paint_violet" paint_type = "purple" black icon_state = "paint_black" - paint_type = "gray" + paint_type = "black" white icon_state = "paint_white"