cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/supplypacks.dm
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/green,
/obj/item/weapon/reagent_containers/glass/paint/blue, /obj/item/weapon/reagent_containers/glass/paint/blue,
/obj/item/weapon/reagent_containers/glass/paint/yellow, /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/black,
/obj/item/weapon/reagent_containers/glass/paint/white, /obj/item/weapon/reagent_containers/glass/paint/white,
/obj/item/weapon/reagent_containers/glass/paint/remover, /obj/item/weapon/reagent_containers/glass/paint/remover,

4
code/game/objects/items/crayons.dm
View File

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

20
code/game/objects/items/weapons/paint.dm
View File

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

2
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -189,7 +189,7 @@
new /obj/item/toy/crayon/yellow(src) new /obj/item/toy/crayon/yellow(src)
new /obj/item/toy/crayon/green(src) new /obj/item/toy/crayon/green(src)
new /obj/item/toy/crayon/blue(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) new /obj/item/toy/crayon/black(src)
update_icon() update_icon()

BIN
icons/obj/items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 107 KiB

2
maps/LampreyStation.dmm
View File

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