Merge pull request #8969 from Fox-McCloud/surgery-set

Updates Surgery Augment: Adds it to R&D

code/modules/research/designs/bluespace_designs.dm

@@ -57,7 +57,7 @@
 	id = "telepad_beacon"
 	req_tech = list("programming" = 5, "bluespace" = 4, "engineering" = 4, "plasmatech" = 4)
 	build_type = PROTOLATHE
-	materials = list (MAT_METAL = 2000, MAT_GLASS = 1750, MAT_SILVER = 500)
+	materials = list(MAT_METAL = 2000, MAT_GLASS = 1750, MAT_SILVER = 500)
 	build_path = /obj/item/telepad_beacon
 	category = list("Bluespace")
 
@@ -67,6 +67,6 @@
 	id = "beacon"
 	req_tech = list("bluespace" = 1)
 	build_type = PROTOLATHE
-	materials = list (MAT_METAL = 150, MAT_GLASS = 100)
+	materials = list(MAT_METAL = 150, MAT_GLASS = 100)
 	build_path = /obj/item/radio/beacon
 	category = list("Bluespace")

code/modules/research/designs/medical_designs.dm

@@ -181,7 +181,7 @@
 	id = "scalpel_manager"
 	req_tech = list("biotech" = 4, "materials" = 7, "magnets" = 5, "programming" = 4)
 	build_type = PROTOLATHE
-	materials = list (MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_DIAMOND = 1000)
+	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_DIAMOND = 1000)
 	build_path = /obj/item/scalpel/laser/manager
 	category = list("Medical")
 
@@ -271,13 +271,24 @@
 	build_path = /obj/item/organ/internal/cyberimp/mouth/breathing_tube
 	category = list("Misc", "Medical")
 
+/datum/design/cyberimp_surgical
+	name = "Surgical Arm Implant"
+	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
+	id = "ci-surgey"
+	req_tech = list("materials" = 3, "engineering" = 3, "biotech" = 3, "programming" = 2, "magnets" = 3)
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
+	construction_time = 200
+	build_path = /obj/item/organ/internal/cyberimp/arm/surgery
+	category = list("Misc", "Medical")
+
 /datum/design/cyberimp_toolset
 	name = "Toolset Arm Implant"
 	desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm."
 	id = "ci-toolset"
 	req_tech = list("materials" = 3, "engineering" = 4, "biotech" = 4, "powerstorage" = 4)
 	build_type = PROTOLATHE | MECHFAB
-	materials = list (MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
+	materials = list(MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
 	construction_time = 200
 	build_path = /obj/item/organ/internal/cyberimp/arm/toolset
 	category = list("Misc", "Medical")

code/modules/surgery/organs/augments_arms.dm

@@ -242,7 +242,7 @@
 /obj/item/organ/internal/cyberimp/arm/surgery
 	name = "surgical toolset implant"
 	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
-	contents = newlist(/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, /obj/item/bonegel, /obj/item/FixOVein, /obj/item/bonesetter)
+	contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/bonegel/augment, /obj/item/FixOVein/augment, /obj/item/bonesetter/augment)
 	origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
 
 // lets make IPCs even *more* vulnerable to EMPs!

code/modules/surgery/tools.dm

@@ -8,6 +8,10 @@
 	w_class = WEIGHT_CLASS_SMALL
 	origin_tech = "materials=1;biotech=1"
 
+/obj/item/retractor/augment
+	desc = "Micro-mechanical manipulator for retracting stuff."
+	w_class = WEIGHT_CLASS_TINY
+	toolspeed = 0.5
 
 /obj/item/hemostat
 	name = "hemostat"
@@ -20,6 +24,9 @@
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "pinched")
 
+/obj/item/hemostat/augment
+	desc = "Tiny servos power a pair of pincers to stop bleeding."
+	toolspeed = 0.5
 
 /obj/item/cautery
 	name = "cautery"
@@ -32,6 +39,9 @@
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("burnt")
 
+/obj/item/cautery/augment
+	desc = "A heated element that cauterizes wounds."
+	toolspeed = 0.5
 
 /obj/item/surgicaldrill
 	name = "surgical drill"
@@ -52,6 +62,12 @@
 							"<span class='suicide'>[user] is pressing [src] to [user.p_their()] chest and activating it! It looks like [user.p_theyre()] trying to commit suicide.</span>"))
 		return (BRUTELOSS)
 
+/obj/item/surgicaldrill/augment
+	desc = "Effectively a small power drill contained within your arm, edges dulled to prevent tissue damage. May or may not pierce the heavens."
+	hitsound = 'sound/weapons/circsawhit.ogg'
+	force = 10
+	w_class = WEIGHT_CLASS_SMALL
+	toolspeed = 0.5
 
 /obj/item/scalpel
 	name = "scalpel"
@@ -78,6 +94,10 @@
 		return (BRUTELOSS)
 
 
+/obj/item/scalpel/augment
+	desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy."
+	toolspeed = 0.5
+
 /*
  * Researchable Scalpels
  */
@@ -129,6 +149,12 @@
 	origin_tech = "biotech=1;combat=1"
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 
+/obj/item/circular_saw/augment
+	desc = "A small but very fast spinning saw. Edges dulled to prevent accidental cutting inside of the surgeon."
+	force = 10
+	w_class = WEIGHT_CLASS_SMALL
+	toolspeed = 0.5
+
 //misc, formerly from code/defines/weapons.dm
 /obj/item/bonegel
 	name = "bone gel"
@@ -139,6 +165,9 @@
 	throwforce = 1.0
 	origin_tech = "materials=1;biotech=1"
 
+/obj/item/bonegel/augment
+	toolspeed = 0.5
+
 /obj/item/FixOVein
 	name = "FixOVein"
 	icon = 'icons/obj/surgery.dmi'
@@ -148,6 +177,9 @@
 	origin_tech = "materials=1;biotech=1"
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/FixOVein/augment
+	toolspeed = 0.5
+
 /obj/item/bonesetter
 	name = "bone setter"
 	icon = 'icons/obj/surgery.dmi'
@@ -160,6 +192,9 @@
 	attack_verb = list("attacked", "hit", "bludgeoned")
 	origin_tech = "materials=1;biotech=1"
 
+/obj/item/bonesetter/augment
+	toolspeed = 0.5
+
 /obj/item/surgical_drapes
 	name = "surgical drapes"
 	desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."