Merge branch 'sergey-rework' of https://github.com/V2LenKagamine/Ship…

…test into surgery-rework

code/__DEFINES/tools.dm

@@ -14,6 +14,8 @@
 #define TOOL_DRILL "drill"
 #define TOOL_SCALPEL "scalpel"
 #define TOOL_SAW "saw"
+#define TOOL_BONEGEL "bonegel"
+#define TOOL_BONESETTER "bonesetter"
 
 // If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
 // tool sound is only played when op is started. If not, it's played twice.

code/__HELPERS/global_lists.dm

@@ -65,6 +65,11 @@
 		GLOB.surgeries_list += new path()
 	sortList(GLOB.surgeries_list, /proc/cmp_typepaths_asc)
 
+	//Omni-surgery steps
+	for(var/path in subtypesof(/datum/surgery_step/omni))
+		GLOB.omnisurgerysteps_list += new path()
+	sortList(GLOB.omnisurgerysteps_list, /proc/cmp_typepaths_asc)
+
 	// Hair Gradients - Initialise all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
 	for(var/path in subtypesof(/datum/sprite_accessory/hair_gradient))
 		var/datum/sprite_accessory/hair_gradient/H = new path()

code/_globalvars/lists/objects.dm

@@ -18,6 +18,7 @@ GLOBAL_LIST(chemical_reagents_list)				//list of all /datum/reagent datums index
 GLOBAL_LIST_EMPTY(materials_list)				//list of all /datum/material datums indexed by material id.
 GLOBAL_LIST_EMPTY(tech_list)					//list of all /datum/tech datums indexed by id.
 GLOBAL_LIST_EMPTY(surgeries_list)				//list of all surgeries by name, associated with their path.
+GLOBAL_LIST_EMPTY(omnisurgerysteps_list)		//List of all Omni-Surgery steps, associated with their path.
 GLOBAL_LIST_EMPTY(crafting_recipes)				//list of all table craft recipes
 GLOBAL_LIST_EMPTY(rcd_list)					//list of Rapid Construction Devices.
 GLOBAL_LIST_EMPTY(apcs_list)					//list of all Area Power Controller machines, separate from machines for powernet speeeeeeed.

code/game/objects/items/storage/backpack.dm

@@ -460,6 +460,8 @@
 	new /obj/item/cautery(src)
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/razor(src)
+	new /obj/item/bonegel(src)
+	new /obj/item/bonesetter(src)
 
 /obj/item/storage/backpack/duffelbag/sec
 	name = "security duffel bag"

code/modules/research/designs/medical_designs.dm

@@ -649,157 +649,9 @@
 	surgery = /datum/surgery/advanced/experimental_dissection/alien
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
-/datum/design/surgery/lobotomy
-	name = "Lobotomy"
-	desc = "An invasive surgical procedure which guarantees removal of almost all brain traumas, but might cause another permanent trauma in return."
-	id = "surgery_lobotomy"
-	surgery = /datum/surgery/advanced/lobotomy
-	research_icon_state = "surgery_head"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/pacify
-	name = "Pacification"
-	desc = "A surgical procedure which permanently inhibits the aggression center of the brain, making the patient unwilling to cause direct harm."
-	id = "surgery_pacify"
-	surgery = /datum/surgery/advanced/pacify
-	research_icon_state = "surgery_head"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/viral_bonding
-	name = "Viral Bonding"
-	desc = "A surgical procedure that forces a symbiotic relationship between a virus and its host. The patient must be dosed with spaceacillin, virus food, and formaldehyde."
-	id = "surgery_viral_bond"
-	surgery = /datum/surgery/advanced/viral_bonding
-	research_icon_state = "surgery_chest"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
 /datum/design/surgery/healing //PLEASE ACCOUNT FOR UNIQUE HEALING BRANCHES IN THE hptech HREF (currently 2 for Brute/Burn; Combo is bonus)
 	name = "Tend Wounds"
 	desc = "An upgraded version of the original surgery."
 	id = "surgery_healing_base" //holder because CI cries otherwise. Not used in techweb unlocks.
 	research_icon_state = "surgery_chest"
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/healing/brute_upgrade
-	name = "Tend Wounds (Brute) Upgrade"
-	surgery = /datum/surgery/healing/brute/upgraded
-	id = "surgery_heal_brute_upgrade"
-
-/datum/design/surgery/healing/brute_upgrade_2
-	name = "Tend Wounds (Brute) Upgrade"
-	surgery = /datum/surgery/healing/brute/upgraded/femto
-	id = "surgery_heal_brute_upgrade_femto"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/healing/burn_upgrade
-	name = "Tend Wounds (Burn) Upgrade"
-	surgery = /datum/surgery/healing/burn/upgraded
-	id = "surgery_heal_burn_upgrade"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/healing/burn_upgrade_2
-	name = "Tend Wounds (Burn) Upgrade"
-	surgery = /datum/surgery/healing/burn/upgraded/femto
-	id = "surgery_heal_burn_upgrade_femto"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/healing/combo
-	name = "Tend Wounds (Physical)"
-	desc = "A surgical procedure that repairs both bruises and burns. Repair efficiency is not as high as the individual surgeries but it is faster."
-	surgery = /datum/surgery/healing/combo
-	id = "surgery_heal_combo"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/healing/combo_upgrade
-	name = "Tend Wounds (Physical) Upgrade"
-	surgery = /datum/surgery/healing/combo/upgraded
-	id = "surgery_heal_combo_upgrade"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/healing/combo_upgrade_2
-	name = "Tend Wounds (Physical) Upgrade"
-	desc = "A surgical procedure that repairs both bruises and burns faster than their individual counterparts. It is more effective than both the individual surgeries."
-	surgery = /datum/surgery/healing/combo/upgraded/femto
-	id = "surgery_heal_combo_upgrade_femto"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/brainwashing
-	name = "Brainwashing"
-	desc = "A surgical procedure which directly implants a directive into the patient's brain, making it their absolute priority. It can be cleared using a mindshield implant."
-	id = "surgery_brainwashing"
-	surgery = /datum/surgery/advanced/brainwashing
-	research_icon_state = "surgery_head"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/nerve_splicing
-	name = "Nerve Splicing"
-	desc = "A surgical procedure which splices the patient's nerves, making them more resistant to stuns."
-	id = "surgery_nerve_splice"
-	surgery = /datum/surgery/advanced/bioware/nerve_splicing
-	research_icon_state = "surgery_chest"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/nerve_grounding
-	name = "Nerve Grounding"
-	desc = "A surgical procedure which makes the patient's nerves act as grounding rods, protecting them from electrical shocks."
-	id = "surgery_nerve_ground"
-	surgery = /datum/surgery/advanced/bioware/nerve_grounding
-	research_icon_state = "surgery_chest"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/vein_threading
-	name = "Vein Threading"
-	desc = "A surgical procedure which severely reduces the amount of blood lost in case of injury."
-	id = "surgery_vein_thread"
-	surgery = /datum/surgery/advanced/bioware/vein_threading
-	research_icon_state = "surgery_chest"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/muscled_veins
-	name = "Vein Muscle Membrane"
-	desc = "A surgical procedure which adds a muscled membrane to blood vessels, allowing them to pump blood without a heart."
-	id = "surgery_muscled_veins"
-	surgery = /datum/surgery/advanced/bioware/muscled_veins
-	research_icon_state = "surgery_chest"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/ligament_hook
-	name = "Ligament Hook"
-	desc = "A surgical procedure which reshapes the connections between torso and limbs, making it so limbs can be attached manually if severed. \
-	However this weakens the connection, making them easier to detach as well."
-	id = "surgery_ligament_hook"
-	surgery = /datum/surgery/advanced/bioware/ligament_hook
-	research_icon_state = "surgery_chest"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/ligament_reinforcement
-	name = "Ligament Reinforcement"
-	desc = "A surgical procedure which adds a protective tissue and bone cage around the connections between the torso and limbs, 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"
-	surgery = /datum/surgery/advanced/bioware/ligament_reinforcement
-	research_icon_state = "surgery_chest"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/cortex_imprint
-	name = "Cortex Imprint"
-	desc = "A surgical procedure which modifies the cerebral cortex into a redundant neural pattern, making the brain able to bypass damage caused by minor brain traumas."
-	id = "surgery_cortex_imprint"
-	surgery = /datum/surgery/advanced/bioware/cortex_imprint
-	research_icon_state = "surgery_head"
-
-/datum/design/surgery/cortex_folding
-	name = "Cortex Folding"
-	desc = "A surgical procedure which modifies the cerebral cortex into a complex fold, giving space to non-standard neural patterns."
-	id = "surgery_cortex_folding"
-	surgery = /datum/surgery/advanced/bioware/cortex_folding
-	research_icon_state = "surgery_head"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/surgery/necrotic_revival
-	name = "Necrotic Revival"
-	desc = "An experimental surgical procedure that stimulates the growth of a Romerol tumor inside the patient's brain. Requires zombie powder or rezadone."
-	id = "surgery_zombie"
-	surgery = /datum/surgery/advanced/necrotic_revival
-	research_icon_state = "surgery_head"
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL

code/modules/research/techweb/all_nodes.dm

@@ -124,40 +124,21 @@
 	export_price = 5000
 
 /////////////////////////Advanced Surgery/////////////////////////
-/datum/techweb_node/imp_wt_surgery
-	id = "imp_wt_surgery"
-	display_name = "Improved Wound-Tending Surgery"
-	description = "Who would have known being more gentle with a hemostat decreases patient pain?"
-	prereq_ids = list("biotech")
-	design_ids = list("surgery_heal_brute_upgrade","surgery_heal_burn_upgrade")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
-	export_price = 1000
-
-
 /datum/techweb_node/adv_surgery
 	id = "adv_surgery"
 	display_name = "Advanced Surgery"
 	description = "When simple medicine doesn't cut it."
-	prereq_ids = list("imp_wt_surgery")
-	design_ids = list("surgery_lobotomy", "surgery_heal_brute_upgrade_femto", "surgery_heal_burn_upgrade_femto","surgery_heal_combo","surgery_adv_dissection")
+	prereq_ids = list("biotech")
+	design_ids = list("surgery_adv_dissection")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
 	export_price = 4000
 
-/datum/techweb_node/exp_surgery
-	id = "exp_surgery"
-	display_name = "Experimental Surgery"
-	description = "When evolution isn't fast enough."
-	prereq_ids = list("adv_surgery")
-	design_ids = list("surgery_pacify","surgery_vein_thread","surgery_muscled_veins","surgery_nerve_splice","surgery_nerve_ground","surgery_ligament_hook","surgery_ligament_reinforcement","surgery_viral_bond", "surgery_heal_combo_upgrade", "surgery_exp_dissection", "surgery_cortex_imprint","surgery_cortex_folding")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
-	export_price = 5000
-
 /datum/techweb_node/alien_surgery
 	id = "alien_surgery"
 	display_name = "Alien Surgery"
 	description = "Abductors did nothing wrong."
-	prereq_ids = list("exp_surgery", "alientech")
-	design_ids = list("surgery_brainwashing","surgery_zombie","surgery_heal_combo_upgrade_femto", "surgery_ext_dissection")
+	prereq_ids = list("alientech")
+	design_ids = list("surgery_ext_dissection")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
 	export_price = 5000
 

code/modules/ruins/spaceruin_code/forgottenship.dm

@@ -33,10 +33,11 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
 	default_raw_text = "Greetings, operatives. You are assigned to SCSBC-12(Syndicate Cyber Sun Battle Cruiser 12) to protect our high-ranking officer while he is on his way to next outpost. While you are travelling, he is the captain of this ship and <b>you must</b> obey his orders.<br><br>Remember, disobeying high-ranking officer orders is a reason for termination."
 
 ///////////	forgottenship items
-/obj/item/disk/surgery/forgottenship
+/*/obj/item/disk/surgery/forgottenship
 	name = "Advanced Surgery Disk"
 	desc = "A disk that contains advanced surgery procedures, must be loaded into an Operating Console."
-	surgeries = list(/datum/surgery/advanced/lobotomy, /datum/surgery/advanced/bioware/vein_threading, /datum/surgery/advanced/bioware/nerve_splicing)
+	surgeries = list(/datum/surgery/advanced/lobotomy, /datum/surgery/advanced/bioware/vein_threading, /datum/surgery/advanced/bioware/nerve_splicing) 
+	Might be used later; leaving it commented because I'm unsure */
 
 /obj/structure/fluff/empty_sleeper/syndicate/captain
 	icon_state = "sleeper_s-open"