diff --git a/code/modules/surgery/operations/operation_autopsy.dm b/code/modules/surgery/operations/operation_autopsy.dm index dccaca144fa..bae4a7d5e22 100644 --- a/code/modules/surgery/operations/operation_autopsy.dm +++ b/code/modules/surgery/operations/operation_autopsy.dm @@ -5,7 +5,7 @@ implements = list(/obj/item/autopsy_scanner = 1) time = 10 SECONDS success_sound = 'sound/machines/printer.ogg' - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // BUBBER EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // BUBBER EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC operation_flags = OPERATION_MORBID | OPERATION_IGNORE_CLOTHES all_surgery_states_required = SURGERY_SKIN_OPEN diff --git a/code/modules/surgery/operations/operation_bioware.dm b/code/modules/surgery/operations/operation_bioware.dm index 6d97d8007d4..0e2f71d792c 100644 --- a/code/modules/surgery/operations/operation_bioware.dm +++ b/code/modules/surgery/operations/operation_bioware.dm @@ -4,7 +4,7 @@ IMPLEMENT_HAND = 1, ) operation_flags = OPERATION_AFFECTS_MOOD | OPERATION_NOTABLE | OPERATION_MORBID | OPERATION_LOCKED - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC time = 12.5 SECONDS all_surgery_states_required = SURGERY_SKIN_OPEN|SURGERY_BONE_SAWED|SURGERY_ORGANS_CUT /// What status effect is gained when the surgery is successful? diff --git a/code/modules/surgery/operations/operation_filter.dm b/code/modules/surgery/operations/operation_filter.dm index a4af6ea2963..7828049dcad 100644 --- a/code/modules/surgery/operations/operation_filter.dm +++ b/code/modules/surgery/operations/operation_filter.dm @@ -5,7 +5,7 @@ implements = list(/obj/item/blood_filter = 1) time = 2.5 SECONDS operation_flags = OPERATION_LOOPING - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC success_sound = 'sound/machines/card_slide.ogg' all_surgery_states_required = SURGERY_SKIN_OPEN any_surgery_states_blocked = SURGERY_VESSELS_UNCLAMPED diff --git a/code/modules/surgery/operations/operation_generic.dm b/code/modules/surgery/operations/operation_generic.dm index a31305031c0..aae78f4cb02 100644 --- a/code/modules/surgery/operations/operation_generic.dm +++ b/code/modules/surgery/operations/operation_generic.dm @@ -5,7 +5,7 @@ // rnd_name = "Laparotomy / Craniotomy / Myotomy (Make Incision)" // Maybe we keep this one simple desc = "Make an incision in the patient's skin to access internal organs. \ Causes \"cut skin\" surgical state." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC replaced_by = /datum/surgery_operation/limb/incise_skin/abductor implements = list( TOOL_SCALPEL = 1, @@ -103,7 +103,7 @@ desc = "Retract the patient's skin to access their internal organs. \ Causes \"skin open\" surgical state." operation_flags = OPERATION_NO_PATIENT_REQUIRED - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC replaced_by = /datum/surgery_operation/limb/retract_skin/abductor implements = list( TOOL_RETRACTOR = 1, @@ -147,7 +147,7 @@ name = "mend skin incision" desc = "Mend the incision in the patient's skin, closing it up. \ Clears most surgical states." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC operation_flags = OPERATION_PRIORITY_NEXT_STEP | OPERATION_NO_PATIENT_REQUIRED replaced_by = /datum/surgery_operation/limb/close_skin/abductor implements = list( @@ -216,7 +216,7 @@ name = "clamp bleeders" desc = "Clamp bleeding blood vessels in the patient's body to prevent blood loss. \ Causes \"vessels clamped\" surgical state." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC operation_flags = OPERATION_PRIORITY_NEXT_STEP | OPERATION_NO_PATIENT_REQUIRED replaced_by = /datum/surgery_operation/limb/clamp_bleeders/abductor implements = list( @@ -260,7 +260,7 @@ name = "unclamp bleeders" desc = "Unclamp blood vessels in the patient's body to allow blood flow again. \ Clears \"vessels clamped\" surgical state." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC operation_flags = OPERATION_NO_PATIENT_REQUIRED replaced_by = /datum/surgery_operation/limb/unclamp_bleeders/abductor implements = list( @@ -307,7 +307,7 @@ name = "saw limb bone" desc = "Saw through the patient's bones to access their internal organs. \ Causes \"bone sawed\" surgical state." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC implements = list( TOOL_SAW = 1, /obj/item/shovel/serrated = 1.33, @@ -370,7 +370,7 @@ name = "fix limb bone" desc = "Repair a patient's cut or broken bones. \ Clears \"bone sawed\" and \"bone drilled\" surgical states." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC operation_flags = OPERATION_NO_PATIENT_REQUIRED implements = list( /obj/item/stack/medical/bone_gel = 1, @@ -425,7 +425,7 @@ name = "drill limb bone" desc = "Drill through a patient's bones. \ Causes \"bone drilled\" surgical state." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC operation_flags = OPERATION_NO_PATIENT_REQUIRED implements = list( TOOL_DRILL = 1, @@ -477,7 +477,7 @@ name = "incise organs" desc = "Make an incision in the patient's internal organ tissue to allow for manipulation or repair. \ Causes \"organs cut\" surgical state." - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC operation_flags = OPERATION_NO_PATIENT_REQUIRED replaced_by = /datum/surgery_operation/limb/incise_organs/abductor implements = list( diff --git a/code/modules/surgery/operations/operation_generic_mechanic.dm b/code/modules/surgery/operations/operation_generic_mechanic.dm index 6238598129e..f3674249fa5 100644 --- a/code/modules/surgery/operations/operation_generic_mechanic.dm +++ b/code/modules/surgery/operations/operation_generic_mechanic.dm @@ -11,7 +11,7 @@ /obj/item = 10, // i think this amounts to a 180% chance of failure (clamped to 99%) ) operation_flags = OPERATION_SELF_OPERABLE | OPERATION_MECHANIC | OPERATION_NO_PATIENT_REQUIRED - required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = BODYTYPE_ROBOTIC | BODYTYPE_NANO // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC time = 2.4 SECONDS preop_sound = 'sound/items/tools/screwdriver.ogg' success_sound = 'sound/items/tools/screwdriver2.ogg' @@ -47,7 +47,7 @@ name = "open hatch" desc = "Open the hatch of a mechanical patient to access its internals. \ Causes \"skin open\" and \"vessels clamped\" surgical states." - required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = BODYTYPE_ROBOTIC | BODYTYPE_NANO // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC implements = list( IMPLEMENT_HAND = 1, TOOL_CROWBAR = 1, @@ -83,7 +83,7 @@ name = "screw shell" desc = "Screw the shell of a mechanical patient back into place. \ Clears most surgical states." - required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = BODYTYPE_ROBOTIC | BODYTYPE_NANO // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC implements = list( TOOL_SCREWDRIVER = 1, TOOL_SCALPEL = 1.33, @@ -129,7 +129,7 @@ name = "prepare electronics" desc = "Prepare the internal electronics of a mechanical patient for surgery. \ Causes \"organs cut\" surgical state." - required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = BODYTYPE_ROBOTIC | BODYTYPE_NANO // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC implements = list( TOOL_MULTITOOL = 1, TOOL_HEMOSTAT = 1.33, @@ -164,7 +164,7 @@ name = "unwrench endoskeleton" desc = "Unwrench a mechanical patient's endoskeleton to access its internals. \ Clears \"bone sawed\" surgical state." - required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = BODYTYPE_ROBOTIC | BODYTYPE_NANO // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC implements = list( TOOL_WRENCH = 1, TOOL_RETRACTOR = 1.33, @@ -198,7 +198,7 @@ name = "wrench endoskeleton" desc = "Wrench a mechanical patient's endoskeleton back into place. \ Clears \"bone sawed\" surgical state." - required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = BODYTYPE_ROBOTIC | BODYTYPE_NANO // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC implements = list( TOOL_WRENCH = 1, TOOL_RETRACTOR = 1.33, diff --git a/code/modules/surgery/operations/operation_lipo.dm b/code/modules/surgery/operations/operation_lipo.dm index 8f3d3ed54f6..6379db708ae 100644 --- a/code/modules/surgery/operations/operation_lipo.dm +++ b/code/modules/surgery/operations/operation_lipo.dm @@ -13,7 +13,7 @@ /obj/item = 5, ) time = 6.4 SECONDS - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC preop_sound = list( /obj/item/circular_saw = 'sound/items/handling/surgery/saw.ogg', /obj/item = 'sound/items/handling/surgery/scalpel1.ogg', diff --git a/code/modules/surgery/operations/operation_organ_manip.dm b/code/modules/surgery/operations/operation_organ_manip.dm index aa8ae5d0cc2..788de1c927c 100644 --- a/code/modules/surgery/operations/operation_organ_manip.dm +++ b/code/modules/surgery/operations/operation_organ_manip.dm @@ -5,7 +5,7 @@ name = "organ manipulation" abstract_type = /datum/surgery_operation/limb/organ_manipulation operation_flags = OPERATION_MORBID | OPERATION_NOTABLE | OPERATION_NO_PATIENT_REQUIRED - required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // BUBBER EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = ~BODYTYPE_ROBOTIC + required_bodytype = (~BODYTYPE_ROBOTIC & ~BODYTYPE_SYNTHETIC) // BUBBER EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = ~BODYTYPE_ROBOTIC /// Radial slice datums for every organ type we can manipulate VAR_PRIVATE/list/cached_organ_manipulation_options @@ -240,7 +240,7 @@ /datum/surgery_operation/limb/organ_manipulation/internal/mechanic name = "prosthetic organ manipulation" - required_bodytype = (BODYTYPE_ROBOTIC| BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = (BODYTYPE_ROBOTIC | BODYTYPE_SYNTHETIC | BODYTYPE_NANO) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = (BODYTYPE_ROBOTIC | BODYTYPE_SYNTHETIC) remove_implements = list( TOOL_CROWBAR = 1, TOOL_HEMOSTAT = 1, @@ -272,7 +272,7 @@ /datum/surgery_operation/limb/organ_manipulation/external/mechanic name = "prosthetic feature manipulation" - required_bodytype = (BODYTYPE_ROBOTIC| BODYTYPE_SYNTHETIC) // NOVA EDIT CHANGE - SYNTH FLAGS -Orginal: required_bodytype = BODYTYPE_ROBOTIC + required_bodytype = (BODYTYPE_ROBOTIC | BODYTYPE_SYNTHETIC | BODYTYPE_NANO) // NOVA EDIT CHANGE - SYNTH FLAGS -Original: required_bodytype = BODYTYPE_ROBOTIC // BUBBER EDIT CHANGE - NANO FLAGS -Original: required_bodytype = (BODYTYPE_ROBOTIC | BODYTYPE_SYNTHETIC) remove_implements = list( TOOL_CROWBAR = 1, TOOL_HEMOSTAT = 1,