From 4e4e39b890d42c3ab9dd7c8bae7730f93d97f121 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Sat, 28 Dec 2019 23:42:25 +0100
Subject: [PATCH] Toy click fix + langserv fixes. (#7837)

You can now actually take toys out of your pockets.

Fixes langserver again.
---
 code/game/objects/items/toys.dm               | 11 +----
 .../file_system/programs/command/comm.dm      |  6 ---
 html/changelogs/mattatlas-whowrotethis.yml    | 41 +++++++++++++++++++
 3 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 html/changelogs/mattatlas-whowrotethis.yml

diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 471c5e4636b..5307be8645f 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -431,21 +431,12 @@
 	drop_sound = 'sound/mecha/mechstep.ogg'
 
 //all credit to skasi for toy mech fun ideas
-/obj/item/toy/prize/attack_self(mob/user as mob)
+/obj/item/toy/prize/attack_self(mob/user)
 	if(cooldown < world.time - 8)
 		to_chat(user, "<span class='notice'>You play with [src].</span>")
 		playsound(user, 'sound/mecha/mechstep.ogg', 20, 1)
 		cooldown = world.time
 
-/obj/item/toy/prize/attack_hand(mob/user as mob)
-	if(loc == user)
-		if(cooldown < world.time - 8)
-			to_chat(user, "<span class='notice'>You play with [src].</span>")
-			playsound(user, 'sound/mecha/mechturn.ogg', 20, 1)
-			cooldown = world.time
-			return
-	..()
-
 /obj/item/toy/prize/ripley
 	name = "toy ripley"
 	desc = "Mini-Mecha action figure! Collect them all! 1/11."
diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm
index 59452f55810..3d482cf2655 100644
--- a/code/modules/modular_computers/file_system/programs/command/comm.dm
+++ b/code/modules/modular_computers/file_system/programs/command/comm.dm
@@ -447,9 +447,3 @@ Command action procs
 	message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1)
 
 	return
-
-#undef STATE_DEFAULT
-#undef STATE_MESSAGELIST
-#undef STATE_VIEWMESSAGE
-#undef STATE_STATUSDISPLAY
-#undef STATE_ALERT_LEVEL
diff --git a/html/changelogs/mattatlas-whowrotethis.yml b/html/changelogs/mattatlas-whowrotethis.yml
new file mode 100644
index 00000000000..9ef7d83f1fe
--- /dev/null
+++ b/html/changelogs/mattatlas-whowrotethis.yml
@@ -0,0 +1,41 @@
+################################
+# 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
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MattAtlas
+
+# 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: 
+  - bugfix: "Toy figurines now only do the cool action when you activate them instead of when you click them, so you can actually remove them from your pockets."