From 48c6161c4d4aeb58c714f37ef372d47c672269fb Mon Sep 17 00:00:00 2001
From: atermonera <atermonera@gmail.com>
Date: Mon, 26 Feb 2018 12:39:31 -0800
Subject: [PATCH] Adds umbrellas to loadout, for 3 points

---
 code/game/objects/items/weapons/melee/misc.dm            | 8 +++++++-
 .../client/preference_setup/loadout/loadout_utility.dm   | 9 +++++++++
 html/changelogs/Atermonera_umbrelloadout.yml             | 4 ++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Atermonera_umbrelloadout.yml

diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 8985f85bac..c7212c336d 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -20,6 +20,7 @@
 	desc = "To keep the rain off you. Use with caution on windy days."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "umbrella_closed"
+	addblends = "umbrella_closed_a"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 5
@@ -29,7 +30,6 @@
 
 /obj/item/weapon/melee/umbrella/New()
 	..()
-	color = "#"+get_random_colour()
 	update_icon()
 
 /obj/item/weapon/melee/umbrella/attack_self()
@@ -38,10 +38,16 @@
 /obj/item/weapon/melee/umbrella/proc/toggle_umbrella()
 	open = !open
 	icon_state = "umbrella_[open ? "open" : "closed"]"
+	addblends = icon_state + "_a"
 	item_state = icon_state
 	update_icon()
 	if(ishuman(src.loc))
 		var/mob/living/carbon/human/H = src.loc
 		H.update_inv_l_hand(0)
 		H.update_inv_r_hand()
+	..()
+
+// Randomizes color
+/obj/item/weapon/melee/umbrella/random/New()
+	color = "#"+get_random_colour()
 	..()
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm
index cacd0451a4..1d43c268ac 100644
--- a/code/modules/client/preference_setup/loadout/loadout_utility.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm
@@ -137,3 +137,12 @@
 /datum/gear/utility/wheelchair/color/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/utility/umbrella
+	display_name = "Umbrella"
+	path = /obj/item/weapon/melee/umbrella
+	cost = 3
+
+/datum/gear/utility/umbrella/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
\ No newline at end of file
diff --git a/html/changelogs/Atermonera_umbrelloadout.yml b/html/changelogs/Atermonera_umbrelloadout.yml
new file mode 100644
index 0000000000..c4d52fa4cf
--- /dev/null
+++ b/html/changelogs/Atermonera_umbrelloadout.yml
@@ -0,0 +1,4 @@
+author: Atermonera
+delete-after: True
+changes: 
+  - rscadd: "Adds umbrellas to the loadout, for 3 points. Colorable!"