Umbrella colours!

code/datums/greyscale/json_configs/_umbrella.json

@@ -1,16 +1,26 @@
 {
-	"closed": [
+	"umbrella_on": [
 		{
 			"type": "icon_state",
-			"icon_state": "umbrella_closed",
+			"icon_state": "umbrella_on_handle",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_on",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		}
 	],
-	"open": [
+	"umbrella": [
 		{
 			"type": "icon_state",
-			"icon_state": "umbrella_on",
+			"icon_state": "umbrella_handle",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		}

code/datums/greyscale/json_configs/_umbrella_inhand.json

@@ -0,0 +1,31 @@
+{
+	"umbrella_closed": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_closed",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"umbrella_on": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_handle",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_on",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"umbrella_on_BACK": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_on_BACK",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

maplestation_modules/code/datums/greyscale/_greyscale_config.dm

@@ -58,9 +58,9 @@
 /datum/greyscale_config/umbrella_inhand_left
 	name = "Held Umbrella, Left, Closed"
 	icon_file = 'maplestation_modules/icons/mob/inhands/weapons/umbrellas_inhand_lh.dmi'
-	json_config = 'code/datums/greyscale/json_configs/_umbrella.json'
+	json_config = 'code/datums/greyscale/json_configs/_umbrella_inhand.json'
 
 /datum/greyscale_config/umbrella_inhand_right
 	name = "Held Umbrella, Right, Closed"
 	icon_file = 'maplestation_modules/icons/mob/inhands/weapons/umbrellas_inhand_rh.dmi'
-	json_config = 'code/datums/greyscale/json_configs/_umbrella.json'
+	json_config = 'code/datums/greyscale/json_configs/_umbrella_inhand.json'

maplestation_modules/code/game/objects/items/umbrellas.dm

@@ -9,7 +9,7 @@
 	name = "umbrella"
 	desc = "A plain white umbrella."
 	icon = 'maplestation_modules/icons/obj/weapons/umbrellas.dmi'
-	icon_state = "umbrella_closed"
+	icon_state = "umbrella"
 	inhand_icon_state = "umbrella_closed"
 	lefthand_file = 'maplestation_modules/icons/mob/inhands/weapons/umbrellas_inhand_lh.dmi'
 	righthand_file = 'maplestation_modules/icons/mob/inhands/weapons/umbrellas_inhand_rh.dmi'
@@ -126,7 +126,7 @@
 /obj/item/umbrella/parasol
 	name = "parasol"
 	desc = "A black laced parsol, how intricate."
-	icon_state = "parasol_closed"
+	icon_state = "parasol"
 	inhand_icon_state = "parasol_closed"
 	on_inhand_icon_state = "parasol_on"
 	random_color = FALSE

maplestation_modules/story_content/volkan_equipment/code/volkanitems.dm

@@ -124,6 +124,11 @@
 
 	on_inhand_icon_state = "umbrella_volkan_open"
 
+	random_color = FALSE
+	greyscale_config = null
+	greyscale_config_inhand_left = null
+	greyscale_config_inhand_right = null
+
 /obj/item/umbrella/volkan/on_transform(obj/item/source, mob/user, active)
 	. = ..()
 	if(user)