From 991922b323772eb3765ae1e54810cc0873f5aa55 Mon Sep 17 00:00:00 2001
From: ShiggyDiggyDo <33476624+ShiggyDiggyDo@users.noreply.github.com>
Date: Wed, 7 Feb 2018 08:05:11 +0100
Subject: [PATCH] Toy Daggers!

---
 code/game/machinery/computer/arcade.dm |  6 ++++++
 code/game/objects/items/toys.dm        | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 5af01dbe69..e8be8e6d2c 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -46,7 +46,13 @@
 		/obj/item/toy/eightball									= 2,
 		/obj/item/toy/windupToolbox								= 2,
 		/obj/item/toy/clockwork_watch							= 2,
+<<<<<<< HEAD
 		/obj/item/extendohand/acme								= 1)
+=======
+		/obj/item/toy/toy_dagger								= 2,
+		/obj/item/extendohand/acme								= 1,
+		/obj/item/hot_potato/harmless/toy						= 1)
+>>>>>>> ed01b8c... Toy Daggers! (#35352)
 
 	light_color = LIGHT_COLOR_GREEN
 
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 0c6e9f1d6b..1725c91611 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -21,6 +21,7 @@
  *      Kitty toys!
  *		Snowballs
  *		Clockwork Watches
+ *		Toy Daggers
  */
 
 
@@ -1075,6 +1076,22 @@
 	..()
 	to_chat(user, "<span class='info'>Station Time: [worldtime2text()]")
 
+/*
+ * Toy Dagger
+ */
+
+/obj/item/toy/toy_dagger
+	name = "toy dagger"
+	desc = "A cheap plastic replica of a dagger. Produced by THE ARM Toys, Inc."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "render"
+	item_state = "cultdagger"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	inhand_x_dimension = 32
+	inhand_y_dimension = 32
+	w_class = WEIGHT_CLASS_SMALL
+
 /*
  * Xenomorph action figure
  */