Fixes Coloring things Purple and related Paint Tweaks (#28226)

* Fixes Coloring things Purple and Paint Stuff

* Fixes the pathing for a crayon on lamprey
This commit is contained in:
HarseTheef
2020-11-20 07:23:23 -06:00
committed by GitHub
parent 3987112e13
commit ed97b8c03b
6 changed files with 15 additions and 15 deletions

View File

@@ -356,7 +356,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
/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/reagent_containers/glass/paint/remover,

View File

@@ -61,11 +61,11 @@ var/global/list/all_graffitis = list(
shadeColour = "#0082A8"
colourName = "blue"
/obj/item/toy/crayon/violet
/obj/item/toy/crayon/purple
icon_state = "crayonpurple"
colour = "#DA00FF"
shadeColour = "#810CFF"
colourName = "violet"
colourName = "purple"
/obj/item/toy/crayon/black
icon_state = "crayonblack"

View File

@@ -63,9 +63,9 @@ var/global/list/paint_types = subtypesof(/datum/reagent/paint)
icon_state = "paint_yellow"
paint_type = "yellow"
/obj/item/weapon/reagent_containers/glass/paint/violet
icon_state = "paint_violet"
paint_type = "violet"
/obj/item/weapon/reagent_containers/glass/paint/purple
icon_state = "paint_purple"
paint_type = "purple"
/obj/item/weapon/reagent_containers/glass/paint/black
icon_state = "paint_black"
@@ -107,10 +107,10 @@ var/global/list/paint_types = subtypesof(/datum/reagent/paint)
color = "FFFF00"
icon_state = "paint_yellow"
/obj/item/weapon/paint/violet
name = "Violet paint"
/obj/item/weapon/paint/purple
name = "Purple paint"
color = "FF00FF"
icon_state = "paint_violet"
icon_state = "paint_purple"
/obj/item/weapon/paint/black
name = "Black paint"
@@ -140,7 +140,7 @@ var/global/list/paint_types = subtypesof(/datum/reagent/paint)
color = "00FF00"
if("yellow")
color = "FFFF00"
if("violet")
if("purple")
color = "FF00FF"
if("white")
color = "FFFFFF"
@@ -218,10 +218,10 @@ var/global/list/paint_types = subtypesof(/datum/reagent/paint)
color = "#FFFF00"
id = "paint_yellow"
violet
name = "Violet Paint"
purple
name = "Purple Paint"
color = "#FF00FF"
id = "paint_violet"
id = "paint_purple"
black
name = "Black Paint"

View File

@@ -189,7 +189,7 @@
new /obj/item/toy/crayon/yellow(src)
new /obj/item/toy/crayon/green(src)
new /obj/item/toy/crayon/blue(src)
new /obj/item/toy/crayon/violet(src)
new /obj/item/toy/crayon/purple(src)
new /obj/item/toy/crayon/black(src)
update_icon()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 107 KiB

View File

@@ -98469,7 +98469,7 @@
/turf/simulated/floor/arcade,
/area/lamprey/thebelt)
"eff" = (
/obj/item/toy/crayon/violet,
/obj/item/toy/crayon/purple,
/obj/effect/decal/cleanable/ash,
/turf/simulated/floor/plating{
icon_state = "platingdmg3"