From d0b679fd88a2f61447fd8bec984c140c014517ae Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 16 Aug 2020 19:38:57 -0700
Subject: [PATCH] Tweak to the washing machine.

---
 code/game/machinery/washing_machine.dm | 16 +++++++++++-
 html/changelogs/Kot-Washing.yml        | 36 ++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Kot-Washing.yml

diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index cb3e3199153..d252157fc11 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -1,8 +1,15 @@
 /obj/machinery/washing_machine
 	name = "Washing Machine"
+<<<<<<< HEAD
 	desc = "Not a hiding place."
 	icon = 'icons/obj/machines/washing_machine_vr.dmi' //VOREStation Edit
 	icon_state = "wm_1" //VOREStation Edit
+=======
+	desc = "Not a hiding place. Unfit for pets."
+	description_info = "Alt click to start."
+	icon = 'icons/obj/machines/washing_machine.dmi'
+	icon_state = "wm_10"
+>>>>>>> 5d8b41f... Merge pull request #7451 from lbnesquik/Kot-Washing-Tweak
 	density = 1
 	anchored = 1.0
 	clicksound = "button"
@@ -33,10 +40,16 @@
 	. = ..()
 	default_apply_parts()
 	
-/obj/machinery/washing_machine/verb/start()
+/obj/machinery/washing_machine/AltClick()
+	start()
+
+/obj/machinery/washing_machine/verb/start_washing()
 	set name = "Start Washing"
 	set category = "Object"
 	set src in oview(1)
+	start()
+
+/obj/machinery/washing_machine/proc/start()
 
 	if(!istype(usr, /mob/living)) //ew ew ew usr, but it's the only way to check.
 		return
@@ -50,6 +63,7 @@
 	else
 		state = 5
 	update_icon()
+	to_chat(usr, "The washing machine starts a cycle.")
 	playsound(src, 'sound/items/washingmachine.ogg', 50, 1, 1)
 	sleep(200)
 	for(var/atom/A in washing)
diff --git a/html/changelogs/Kot-Washing.yml b/html/changelogs/Kot-Washing.yml
new file mode 100644
index 00000000000..0da4b507c5d
--- /dev/null
+++ b/html/changelogs/Kot-Washing.yml
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: BlinsKot
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "You pansies can now alt click to turn on the washing machine."
\ No newline at end of file