From 21d5781e37461ff3673b7ab4aaac43a2f73eb6d0 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 7 Feb 2018 14:05:34 -0500 Subject: [PATCH] Update arcade.dm --- code/game/machinery/computer/arcade.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index e8be8e6d2c..33a74256ed 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -46,13 +46,8 @@ /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) + /obj/item/extendohand/acme = 1) light_color = LIGHT_COLOR_GREEN