From 2ab07fdb82a75b1cb9de7556b89562be140ef018 Mon Sep 17 00:00:00 2001
From: r4d6 <david.moussettegmail.com>
Date: Mon, 6 Jan 2020 23:43:04 -0500
Subject: [PATCH] Conflict Fix part 1

---
 code/game/machinery/firealarm.dm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 51cd9de2d1..8f7fce8e3e 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -256,21 +256,6 @@
 					return
 	return ..()
 
-/obj/machinery/firealarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
-	if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS))
-		return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
-	return FALSE
-
-/obj/machinery/firealarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
-	switch(passed_mode)
-		if(RCD_UPGRADE_SIMPLE_CIRCUITS)
-			user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
-			"<span class='notice'>You adapt a fire alarm circuit and slot it into the assembly.</span>")
-			buildstage = 1
-			update_icon()
-			return TRUE
-	return FALSE
-
 /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
 	if(.) //damage received