Synth surgery

code/datums/components/surgery_initiator.dm

@@ -106,11 +106,18 @@
 			continue
 		if(!surgery.can_start(user, target))
 			continue
+		// BUBBER ADDITION START
+		if(istype(surgery, /datum/surgery/robot))
+			var/datum/surgery/robot/robot_surgery = surgery
+			if(robot_surgery.is_closer)
+				continue
+		// BUBBER ADDITION END
 
 		available_surgeries += surgery
 
 	return available_surgeries
 
+// BUBBER COMMENT Overridden by surgery_initiator in modular_zubbers
 /// Does the surgery de-initiation.
 /datum/component/surgery_initiator/proc/attempt_cancel_surgery(datum/surgery/the_surgery, mob/living/patient, mob/user)
 	var/selected_zone = user.zone_selected

code/modules/antagonists/pirate/pirate_shuttle_equipment.dm

@@ -161,14 +161,18 @@
 	desc = "A disk that contains advanced surgery procedures, must be loaded into an Operating Console."
 	surgeries = list(
 		/datum/surgery/advanced/lobotomy,
-		/datum/surgery/advanced/lobotomy/mechanic,
+		/datum/surgery/robot/advanced/lobotomy, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/vein_threading,
-		/datum/surgery/advanced/bioware/vein_threading/mechanic,
+		/datum/surgery/robot/advanced/bioware/vein_threading, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/nerve_splicing,
-		/datum/surgery/advanced/bioware/nerve_splicing/mechanic,
-		/datum/surgery_step/heal/combo/upgraded,
-		/datum/surgery_step/pacify,
-		/datum/surgery_step/pacify/mechanic,
+		/datum/surgery/robot/advanced/bioware/nerve_splicing, // BUBBER EDIT
+		// BUBBER EDIT START
+		/datum/surgery/healing/brute/upgraded,
+		/datum/surgery/healing/burn/upgraded,
+		/datum/surgery/robot/healing/upgraded,
+		/datum/surgery/advanced/pacify,
+		/datum/surgery/robot/advanced/pacify,
+		// BUBBER EDIT END
 	)
 
 //Pad & Pad Terminal

code/modules/mod/modules/modules_medical.dm

@@ -409,23 +409,23 @@
 		/datum/surgery/advanced/pacify,
 		/datum/surgery/healing/combo/upgraded/femto,
 		/datum/surgery/advanced/brainwashing,
-		/datum/surgery/advanced/brainwashing/mechanic,
+		/datum/surgery/robot/advanced/brainwashing, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/nerve_splicing,
-		/datum/surgery/advanced/bioware/nerve_splicing/mechanic,
+		/datum/surgery/robot/advanced/bioware/nerve_splicing, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/nerve_grounding,
-		/datum/surgery/advanced/bioware/nerve_grounding/mechanic,
+		/datum/surgery/robot/advanced/bioware/nerve_grounding, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/vein_threading,
-		/datum/surgery/advanced/bioware/vein_threading/mechanic,
+		/datum/surgery/robot/advanced/bioware/vein_threading, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/muscled_veins,
-		/datum/surgery/advanced/bioware/muscled_veins/mechanic,
+		/datum/surgery/robot/advanced/bioware/muscled_veins, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/ligament_hook,
-		/datum/surgery/advanced/bioware/ligament_hook/mechanic,
+		// /datum/surgery/advanced/bioware/ligament_hook/mechanic, // BUBBER REMOVAL
 		/datum/surgery/advanced/bioware/ligament_reinforcement,
-		/datum/surgery/advanced/bioware/ligament_reinforcement/mechanic,
+		/datum/surgery/robot/advanced/bioware/ligament_reinforcement, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/cortex_imprint,
-		/datum/surgery/advanced/bioware/cortex_imprint/mechanic,
+		/datum/surgery/robot/advanced/bioware/cortex_imprint, // BUBBER EDIT
 		/datum/surgery/advanced/bioware/cortex_folding,
-		/datum/surgery/advanced/bioware/cortex_folding/mechanic,
+		/datum/surgery/robot/advanced/bioware/cortex_folding, // BUBBER EDIT
 	)
 
 /obj/item/mod/module/surgical_processor/emergency

code/modules/research/designs/medical_designs.dm

@@ -1099,7 +1099,7 @@
 	name = "Wetware OS Destructive Defragmentation"
 	desc = "A destructive robotic defragmentation method which guarantees removal of almost all brain traumas, but might cause another permanent trauma in return."
 	id = "surgery_lobotomy_mechanic"
-	surgery = /datum/surgery/advanced/lobotomy/mechanic
+	surgery = /datum/surgery/robot/advanced/lobotomy // BUBBER EDIT
 
 /datum/design/surgery/pacify
 	name = "Pacification"
@@ -1112,7 +1112,7 @@
 	name = "Aggression Suppression Programming"
 	desc = "Malware which permanently inhibits the aggression programming of the patient's neural network, making the patient unwilling to cause direct harm."
 	id = "surgery_pacify_mechanic"
-	surgery = /datum/surgery/advanced/pacify/mechanic
+	surgery = /datum/surgery/robot/advanced/pacify // BUBBER EDIT
 
 /datum/design/surgery/viral_bonding
 	name = "Viral Bonding"
@@ -1176,7 +1176,7 @@
 	name = "Reprogramming"
 	desc = "Malware which directly implants a directive into the robotic patient's operating system, making it their absolute priority. It can be cleared using a mindshield implant."
 	id = "surgery_brainwashing_mechanic"
-	surgery = /datum/surgery/advanced/brainwashing/mechanic
+	surgery = /datum/surgery/robot/advanced/brainwashing // BUBBER EDIT
 
 /datum/design/surgery/nerve_splicing
 	name = "Nerve Splicing"
@@ -1189,7 +1189,7 @@
 	name = "System Automatic Reset Subroutine"
 	desc = "A robotic upgrade which upgrades a robotic patient's automatic systems, making them more resistant to stuns."
 	id = "surgery_nerve_splice_mechanic"
-	surgery = /datum/surgery/advanced/bioware/nerve_splicing/mechanic
+	surgery = /datum/surgery/robot/advanced/bioware/nerve_splicing // BUBBER EDIT
 
 /datum/design/surgery/nerve_grounding
 	name = "Nerve Grounding"
@@ -1202,7 +1202,7 @@
 	name = "System Shock Dampening"
 	desc = "A robotic upgrade which installs grounding rods into the robotic patient's system, protecting them from electrical shocks."
 	id = "surgery_nerve_ground_mechanic"
-	surgery = /datum/surgery/advanced/bioware/nerve_grounding/mechanic
+	surgery = /datum/surgery/robot/advanced/bioware/nerve_grounding // BUBBER EDIT
 
 /datum/design/surgery/vein_threading
 	name = "Vein Threading"
@@ -1215,7 +1215,7 @@
 	name = "Hydraulics Routing Optimization"
 	desc = "A robotic upgrade which severely reduces the amount of hydraulic fluid lost in case of injury."
 	id = "surgery_vein_thread_mechanic"
-	surgery = /datum/surgery/advanced/bioware/vein_threading/mechanic
+	surgery = /datum/surgery/robot/advanced/bioware/vein_threading // BUBBER EDIT
 
 /datum/design/surgery/muscled_veins
 	name = "Vein Muscle Membrane"
@@ -1228,7 +1228,7 @@
 	name = "Hydraulics Redundancy Subroutine"
 	desc = "A robotic upgrade which adds sophisticated hydraulics redundancies, allowing a patient to pump hydraulic fluid without an engine."
 	id = "surgery_muscled_veins_mechanic"
-	surgery = /datum/surgery/advanced/bioware/muscled_veins/mechanic
+	surgery = /datum/surgery/robot/advanced/bioware/muscled_veins // BUBBER EDIT
 
 /datum/design/surgery/ligament_hook
 	name = "Ligament Hook"
@@ -1238,12 +1238,14 @@
 	surgery = /datum/surgery/advanced/bioware/ligament_hook
 	research_icon_state = "surgery_chest"
 
+/* BUBBER REMOVAL START
 /datum/design/surgery/ligament_hook/mechanic
 	name = "Anchor Point Snaplocks"
 	desc = "A robotic upgrade which installs rapid detachment anchor points, making it so limbs can be attached manually if detached. \
 		However this weakens the connection, making them easier to detach as well."
 	id = "surgery_ligament_hook_mechanic"
 	surgery = /datum/surgery/advanced/bioware/ligament_hook/mechanic
+BUBBER REMOVAL END */
 
 /datum/design/surgery/ligament_reinforcement
 	name = "Ligament Reinforcement"
@@ -1258,7 +1260,7 @@
 	desc = "A surgical procedure which adds reinforced limb anchor points to the patient's chassis, preventing dismemberment. \
 		However, the nerve connections as a result are more easily interrupted, making it easier to disable limbs with damage."
 	id = "surgery_ligament_reinforcement_mechanic"
-	surgery = /datum/surgery/advanced/bioware/ligament_reinforcement/mechanic
+	surgery = /datum/surgery/robot/advanced/bioware/ligament_reinforcement // BUBBER EDIT
 
 /datum/design/surgery/cortex_imprint
 	name = "Cortex Imprint"
@@ -1272,7 +1274,7 @@
 	desc = "A surgical procedure which updates the patient's operating system to the 'latest version', whatever that means, making the brain able to bypass damage caused by minor brain traumas. \
 		Shame about all the adware."
 	id = "surgery_cortex_imprint_mechanic"
-	surgery = /datum/surgery/advanced/bioware/cortex_imprint/mechanic
+	surgery = /datum/surgery/robot/advanced/bioware/cortex_imprint // BUBBER EDIT
 
 /datum/design/surgery/cortex_folding
 	name = "Cortex Folding"
@@ -1285,7 +1287,7 @@
 	name = "Wetware OS Labyrinthian Programming"
 	desc = "A robotic upgrade which reprograms the patient's neural network in a downright eldritch programming language, giving space to non-standard neural patterns."
 	id = "surgery_cortex_folding_mechanic"
-	surgery = /datum/surgery/advanced/bioware/cortex_folding/mechanic
+	surgery = /datum/surgery/robot/advanced/bioware/cortex_folding // BUBBER EDIT
 
 /datum/design/surgery/necrotic_revival
 	name = "Necrotic Revival"

code/modules/research/techweb/nodes/surgery_nodes.dm

@@ -52,7 +52,7 @@
 		"surgery_cortex_imprint_mechanic",
 		"surgery_heal_combo_upgrade",
 		"surgery_ligament_hook",
-		"surgery_ligament_hook_mechanic",
+		// "surgery_ligament_hook_mechanic", // BUBBER REMOVAL
 		"surgery_ligament_reinforcement",
 		"surgery_ligament_reinforcement_mechanic",
 		"surgery_muscled_veins",

code/modules/surgery/advanced/bioware/cortex_folding.dm

@@ -14,6 +14,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/cortex/folded
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/bioware/cortex_folding/mechanic
 	name = "Wetware OS Labyrinthian Programming"
 	desc = "A robotic upgrade which reprograms the patient's neural network in a downright eldritch programming language, giving space to non-standard neural patterns."
@@ -28,6 +29,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery/advanced/bioware/cortex_folding/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN)

code/modules/surgery/advanced/bioware/cortex_imprint.dm

@@ -14,6 +14,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/cortex/imprinted
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/bioware/cortex_imprint/mechanic
 	name = "Wetware OS Ver 2.0"
 	desc = "A robotic upgrade which updates the patient's operating system to the 'latest version', whatever that means, making the brain able to bypass damage caused by minor brain traumas. \
@@ -29,6 +30,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery/advanced/bioware/cortex_imprint/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN)

code/modules/surgery/advanced/bioware/ligament_hook.dm

@@ -15,6 +15,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/ligaments/hooked
 
+/* BUBBER REMOVAL START - This one isn't getting replaced, this is already a mechanic!
 /datum/surgery/advanced/bioware/ligament_hook/mechanic
 	name = "Anchor Point Snaplocks"
 	desc = "A robotic upgrade which installs rapid detachment anchor points, making it so limbs can be attached manually if detached. \
@@ -30,6 +31,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery_step/apply_bioware/reshape_ligaments
 	name = "reshape ligaments (hand)"

code/modules/surgery/advanced/bioware/ligament_reinforcement.dm

@@ -15,6 +15,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/ligaments/reinforced
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/bioware/ligament_reinforcement/mechanic
 	name = "Anchor Point Reinforcement"
 	desc = "A surgical procedure which adds reinforced limb anchor points to the patient's chassis, preventing dismemberment. \
@@ -30,6 +31,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery_step/apply_bioware/reinforce_ligaments
 	name = "reinforce ligaments (hand)"

code/modules/surgery/advanced/bioware/muscled_veins.dm

@@ -14,6 +14,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/heart/muscled_veins
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/bioware/muscled_veins/mechanic
 	name = "Hydraulics Redundancy Subroutine"
 	desc = "A robotic upgrade which adds sophisticated hydraulics redundancies, allowing a patient to pump hydraulic fluid without an engine."
@@ -28,6 +29,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery_step/apply_bioware/muscled_veins
 	name = "shape vein muscles (hand)"

code/modules/surgery/advanced/bioware/nerve_grounding.dm

@@ -14,6 +14,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/nerves/grounded
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/bioware/nerve_grounding/mechanic
 	name = "System Shock Dampening"
 	desc = "A robotic upgrade which installs grounding rods into the robotic patient's system, protecting them from electrical shocks."
@@ -28,6 +29,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery_step/apply_bioware/ground_nerves
 	name = "ground nerves (hand)"

code/modules/surgery/advanced/bioware/nerve_splicing.dm

@@ -14,6 +14,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/nerves/spliced
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/bioware/nerve_splicing/mechanic
 	name = "System Automatic Reset Subroutine"
 	desc = "A robotic upgrade which upgrades a robotic patient's automatic systems, making them more resistant to stuns."
@@ -28,6 +29,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery_step/apply_bioware/splice_nerves
 	name = "splice nerves (hand)"

code/modules/surgery/advanced/bioware/vein_threading.dm

@@ -14,6 +14,7 @@
 
 	status_effect_gained = /datum/status_effect/bioware/heart/threaded_veins
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/bioware/vein_threading/mechanic
 	name = "Hydraulics Routing Optimization"
 	desc = "A robotic upgrade which severely reduces the amount of hydraulic fluid lost in case of injury."
@@ -28,6 +29,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery_step/apply_bioware/thread_veins
 	name = "thread veins (hand)"

code/modules/surgery/advanced/brainwashing.dm

@@ -7,7 +7,7 @@
 	special_desc = "The disk provides instructions on how to impress an order on a brain, making it the primary objective of the patient."
 	surgeries = list(
 		/datum/surgery/advanced/brainwashing,
-		/datum/surgery/advanced/brainwashing/mechanic,
+		// /datum/surgery/advanced/brainwashing/mechanic, // BUBBER EDIT
 	)
 
 /datum/surgery/advanced/brainwashing
@@ -23,6 +23,7 @@
 		/datum/surgery_step/close,
 	)
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/brainwashing/mechanic
 	name = "Reprogramming"
 	desc = "Malware which directly implants a directive into the robotic patient's operating system, making it their absolute priority. It can be cleared using a mindshield implant."
@@ -35,6 +36,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery/advanced/brainwashing/can_start(mob/user, mob/living/carbon/target)
 	if(!..())
@@ -63,8 +65,11 @@
 		TOOL_MULTITOOL = 85,
 		TOOL_HEMOSTAT = 50,
 		TOOL_WIRECUTTER = 50,
+		/* BUBBER REMOVAL START
 		/obj/item/stack/package_wrap = 35,
-		/obj/item/stack/cable_coil = 15)
+		/obj/item/stack/cable_coil = 15
+		BUBBER REMOVAL END */
+		)
 	preop_sound = 'sound/items/taperecorder/tape_flip.ogg'
 	success_sound = 'sound/items/taperecorder/taperecorder_close.ogg'
 

code/modules/surgery/advanced/lobotomy.dm

@@ -11,6 +11,7 @@
 		/datum/surgery_step/close,
 	)
 
+/* BUBBER REMOVAL START
 /datum/surgery/advanced/lobotomy/mechanic
 	name = "Wetware OS Destructive Defragmentation"
 	desc = "A destructive robotic defragmentation method which guarantees removal of almost all brain traumas, but might cause another permanent trauma in return."
@@ -23,6 +24,7 @@
 		/datum/surgery_step/mechanic_wrench,
 		/datum/surgery_step/mechanic_close,
 	)
+BUBBER REMOVAL END */
 
 /datum/surgery/advanced/lobotomy/can_start(mob/user, mob/living/carbon/target)
 	. = ..()
@@ -52,13 +54,20 @@
 	name = "execute neural defragging (multitool)"
 	implements = list(
 		TOOL_MULTITOOL = 85,
+		/* BUBBER REMOVAL START
 		/obj/item/melee/energy/sword = 55,
 		/obj/item/knife = 35,
 		/obj/item/shard = 25,
 		/obj/item = 20,
+		BUBBER REMOVAL END */
+		// BUBBER ADDITION START
+		TOOL_HEMOSTAT = 35,
+		/obj/item/pen = 15
+		// BUBBER ADDITION END
+
 	)
 	preop_sound = 'sound/items/taperecorder/tape_flip.ogg'
-	success_sound = 'sound/items/taperecorder/taperecorder_close.ogg'
+	success_sound = 'sound/items/weapons/taser.ogg' // BUBBER EDIT
 
 /datum/surgery_step/lobotomize/tool_check(mob/user, obj/item/tool)
 	if(implement_type == /obj/item && !tool.get_sharpness())