From 726ace52eba9f39a300631ceaa8e86ae71543335 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Tue, 26 Mar 2019 12:59:39 -0400
Subject: [PATCH] merg conflict is this

---
 .../research/designs/medical_designs.dm       | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index ca3f2b420b..aea3a3755f 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -195,6 +195,50 @@
 	category = list("Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
+/datum/design/defib_heal
+	name = "Defibrillartor Healing disk"
+	desc = "A disk allowing for greater amounts of healing"
+	id = "defib_heal"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=16000, MAT_GLASS = 18000, MAT_GOLD = 6000, MAT_SILVER = 6000)
+	build_path = /obj/item/disk/medical/defib_heal
+	construction_time = 10
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/datum/design/defib_shock
+	name = "Defibrillartor Anit-Shock Disk"
+	desc = "A disk that helps agains shocking anyone, other then the intented target"
+	id = "defib_shock"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=16000, MAT_GLASS = 18000, MAT_GOLD = 6000, MAT_SILVER = 6000)
+	build_path = /obj/item/disk/medical/defib_shock
+	construction_time = 10
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/datum/design/defib_decay
+	name = "Defibrillartor Body-Decay extender Disk"
+	desc = "A disk that helps defibrillator revive the longer decayed dead"
+	id = "defib_decay"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=16000, MAT_GLASS = 18000, MAT_GOLD = 16000, MAT_SILVER = 6000, MAT_TITANIUM = 2000)
+	build_path = /obj/item/disk/medical/defib_decay
+	construction_time = 10
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/datum/design/defib_speed
+	name = "Defibrllartor Pre-Primer Disk"
+	desc = "A disk that cuts the time charg time in half for defibrillator use"
+	id = "defib_speed"
+	build_type = PROTOLATHE
+	build_path = /obj/item/disk/medical/defib_speed
+	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_GOLD = 26000, MAT_SILVER = 26000)
+	construction_time = 10
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
 
 /////////////////////////////////////////
 //////////Alien Surgery Tools////////////