Medical Borg Tool upgrade (More compact)

code/modules/mob/living/silicon/robot/robot_model.dm

@@ -672,12 +672,12 @@
 		/obj/item/reagent_containers/dropper,
 		/obj/item/reagent_containers/syringe,
 		/obj/item/surgical_drapes,
-		/obj/item/retractor/augment, //monkestation edit start: Augmented tools
-		/obj/item/hemostat/augment,
-		/obj/item/cautery/augment,
-		/obj/item/surgicaldrill/augment,
-		/obj/item/scalpel/augment,
-		/obj/item/circular_saw/augment, //monkestation edit end: Augmented tools
+		/obj/item/retractor, //Monke edit start: remove augment tools
+		/obj/item/hemostat,
+		/obj/item/cautery,
+		/obj/item/surgicaldrill,
+		/obj/item/scalpel,
+		/obj/item/circular_saw, //Monke edit end: remove augment tools
 		/obj/item/bonesetter,
 		/obj/item/blood_filter,
 		/obj/item/extinguisher/mini,

code/modules/research/techweb/cyborg_nodes.dm

@@ -47,6 +47,7 @@
 		"borg_upgrade_piercinghypospray",
 		"borg_upgrade_pinpointer",
 		"borg_upgrade_surgicalprocessor",
+		"borg_upgrade_surgicaltools", //Monke edit: Might need to move this one to the same research node as cybernetic surgical toolset for balance.
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
 

code/modules/surgery/surgery_step.dm

@@ -101,7 +101,7 @@
 	modded_time = min(modded_time, time * SURGERY_SLOWDOWN_CAP_MULTIPLIER)//also if that, then cap modded_time at time*modifier
 
 	if(iscyborg(user))//any immunities to surgery slowdown should go in this check.
-		modded_time = time
+		modded_time = (time * tool.toolspeed) //Monkestation edit, allows borgs to have better surgery speed
 	else if(HAS_TRAIT(user, TRAIT_PERFECT_SURGEON))
 		modded_time = min(round(time * 0.75, 5), modded_time) // monke edit: perfect surgeon will always be at least 25% faster than normal
 

code/modules/surgery/tools.dm

@@ -227,6 +227,10 @@
 	desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy."
 	toolspeed = 0.5
 
+/obj/item/scalpel/borg // Monke edit start:
+	desc = "Ultra-sharp blade attached directly to your servos for extra-accuracy."
+	toolspeed= 0.5 // Monke Edit end: Added a borg scalpel for some different flavor text since, ya know borgs dont exactly have "Bones"
+
 /obj/item/circular_saw
 	name = "circular saw"
 	desc = "For heavy duty cutting."

monkestation/code/game/objects/items/robot/items/robot_upgrades.dm

@@ -12,3 +12,67 @@
 	. = ..()
 	if(.)
 		robutt.RemoveComponentSource(REF(src), /datum/component/fluffy_tongue)
+
+/obj/item/borg/upgrade/surgery
+	name = "Surgical Toolset Upgrade"
+	desc = "An upgrade to the Medical model cyborg's surgical tools, streamlining \
+		the surgical process."
+	icon_state = "cyborg_upgrade3"
+	require_model = TRUE
+	model_type = list(/obj/item/robot_model/medical)
+	model_flags = BORG_MODEL_MEDICAL
+	var/list/adv_surgical_tools = list( /obj/item/circular_saw/augment, /obj/item/scalpel/borg, /obj/item/cautery/augment, /obj/item/retractor/augment, /obj/item/hemostat/augment)
+	var/list/surgical_tools = list( /obj/item/circular_saw, /obj/item/scalpel, /obj/item/cautery, /obj/item/retractor, /obj/item/hemostat)
+/obj/item/borg/upgrade/surgery/action(mob/living/silicon/robot/R, user = usr)
+	. = ..()
+	if(.)
+		for(var/obj/item/module in R.model.modules)
+			if(module.type in surgical_tools)
+				R.model.remove_module(module, TRUE)
+
+		var/obj/item/circular_saw/augment/saw = new /obj/item/circular_saw/augment(R.model)
+		R.model.basic_modules += saw
+		R.model.add_module(saw, FALSE, TRUE)
+
+		var/obj/item/scalpel/borg/scalpel = new /obj/item/scalpel/borg(R.model)
+		R.model.basic_modules += scalpel
+		R.model.add_module(scalpel, FALSE, TRUE)
+
+		var/obj/item/cautery/augment/cautery = new /obj/item/cautery/augment(R.model)
+		R.model.basic_modules += cautery
+		R.model.add_module(cautery, FALSE, TRUE)
+
+		var/obj/item/retractor/augment/retractor = new /obj/item/retractor/augment(R.model)
+		R.model.basic_modules += retractor
+		R.model.add_module(retractor, FALSE, TRUE)
+
+		var/obj/item/hemostat/augment/hemostat = new /obj/item/hemostat/augment(R.model)
+		R.model.basic_modules += hemostat
+		R.model.add_module(hemostat, FALSE, TRUE)
+
+/obj/item/borg/upgrade/surgery/deactivate(mob/living/silicon/robot/R, user = usr)
+	. = ..()
+	if(.)
+		for(var/advsurgtool in adv_surgical_tools) //For some reason only this is the only list that worked.
+			for(advsurgtool in R.model.modules)
+				R.model.remove_module(advsurgtool, TRUE)
+
+		var/obj/item/retractor/retractor = new (R.model)
+		R.model.basic_modules += retractor
+		R.model.add_module(retractor, FALSE, TRUE)
+
+		var/obj/item/scalpel/scalpel = new (R.model)
+		R.model.basic_modules += scalpel
+		R.model.add_module(scalpel, FALSE, TRUE)
+
+		var/obj/item/circular_saw/saw = new (R.model)
+		R.model.basic_modules += saw
+		R.model.add_module(saw, FALSE, TRUE)
+
+		var/obj/item/hemostat/hemo = new (R.model)
+		R.model.basic_modules += hemo
+		R.model.add_module(hemo, FALSE, TRUE)
+
+		var/obj/item/cautery/cautery = new (R.model)
+		R.model.basic_modules += cautery
+		R.model.add_module(cautery, FALSE, TRUE)

monkestation/code/modules/research/designs/mechfabricator_designs.dm

@@ -174,3 +174,14 @@
 		RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL,
 		RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_PEACEKEEPER,
 	)
+
+/datum/design/borg_upgrade_surgical_tools
+	name = "Cyborg Surgical Tools"
+	id = "borg_upgrade_surgicaltools"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/surgery
+	materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.25, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT*1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT*1.5)
+	construction_time = 40
+	category = list(
+		RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL
+	)