Ports CHOMPStation 6626

code/global.dm

@@ -137,8 +137,9 @@ var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J
 
 
 // Used by robots and robot preferences for regular modules.
+//RS Edit || Ports CHOMPStation 6626
 var/list/robot_module_types = list(
-	"Standard", "Engineering", "Surgeon",  "Crisis",
+	"Standard", "Engineering", /*"Surgeon",*/  "Crisis",
 	"Miner",    "Janitor",     "Service",      "Clerical", "Security",
 	"Research"
 )

code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm

@@ -94,10 +94,14 @@
 /obj/item/weapon/reagent_containers/borghypo/hound
 	name = "MediHound hypospray"
 	desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves, designed for heavy-duty medical equipment."
-	charge_cost = 10
-	reagent_ids = list("inaprovaline", "dexalin", "bicaridine", "kelotane", "anti_toxin", "spaceacillin", "paracetamol")
+	//RS Edit Start || Ports CHOMPStation PR6626
+	//charge_cost = 10
+	reagent_ids = list("inaprovaline", "dexalin", "bicaridine", "kelotane", "anti_toxin", "spaceacillin", "tramadol", "adranol")
+	//RS Edit End
 	var/datum/matter_synth/water = null
 
+// RS Edit || Ports CHOMPStation PR6626
+/*
 /obj/item/weapon/reagent_containers/borghypo/hound/process() //Recharges in smaller steps and uses the water reserves as well.
 	if(isrobot(loc))
 		var/mob/living/silicon/robot/R = loc
@@ -108,7 +112,7 @@
 					water.use_charge(charge_cost)
 					reagent_volumes[T] = min(reagent_volumes[T] + 1, volume)
 	return 1
-
+*/
 /obj/item/weapon/reagent_containers/borghypo/hound/lost
 	name = "Hound hypospray"
 	desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves."

code/modules/mob/living/silicon/robot/robot_modules/station.dm

@@ -5,7 +5,7 @@ var/global/list/robot_modules = list(
 	"Research" 		= /obj/item/weapon/robot_module/robot/research,
 	"Miner" 		= /obj/item/weapon/robot_module/robot/miner,
 	"Crisis" 		= /obj/item/weapon/robot_module/robot/medical/crisis,
-	"Surgeon" 		= /obj/item/weapon/robot_module/robot/medical/surgeon,
+	//"Surgeon" 		= /obj/item/weapon/robot_module/robot/medical/surgeon, // RS Edit || Ports CHOMPStation 6626
 	"Security" 		= /obj/item/weapon/robot_module/robot/security/general,
 	"Combat" 		= /obj/item/weapon/robot_module/robot/security/combat,
 	"Engineering"	= /obj/item/weapon/robot_module/robot/engineering,
@@ -232,10 +232,11 @@ var/global/list/robot_modules = list(
 	subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
 	pto_type = PTO_MEDICAL
 
+//RS Edit || Ports CHOMPStation 6626
+/*
 /obj/item/weapon/robot_module/robot/medical/surgeon
 	name = "surgeon robot module"
 
-
 /obj/item/weapon/robot_module/robot/medical/surgeon/create_equipment(var/mob/living/silicon/robot/robot)
 	..()
 	src.modules += new /obj/item/device/healthanalyzer(src)
@@ -299,7 +300,7 @@ var/global/list/robot_modules = list(
 		PS.reagents.add_reagent("pacid", 2 * amount)
 
 	..()
-
+*/
 /obj/item/weapon/robot_module/robot/medical/crisis
 	name = "crisis robot module"
 
@@ -317,17 +318,37 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/weapon/gripper/medical(src)
 	src.modules += new /obj/item/weapon/shockpaddles/robot(src)
 	src.modules += new /obj/item/weapon/inflatable_dispenser/robot(src)
+	//RS Edit start || Ports CHOMPStation 6626 Combining Surgeon and Crisis.
+	src.modules += new /obj/item/weapon/autopsy_scanner(src)
+	src.modules += new /obj/item/weapon/surgical/scalpel/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/hemostat/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/retractor/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/cautery/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/bonegel/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/FixOVein/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/bonesetter/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/circular_saw/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/surgicaldrill/cyborg(src)
+	src.modules += new /obj/item/weapon/surgical/bioregen/cyborg(src)
+	src.modules += new /obj/item/borg/sight/hud/med(src)
+	// RS Edit end
 	var/obj/item/weapon/reagent_containers/spray/PS = new /obj/item/weapon/reagent_containers/spray(src)
 	src.emag += PS
 	PS.reagents.add_reagent("pacid", 250)
 	PS.name = "Polyacid spray"
 
-	var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(15000)
+	var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(30000) //RS Edit || Ports CHOMPStation 6626
 	synths += medicine
 
+	var/obj/item/stack/medical/advanced/clotting/C = new (src) //RS Edit || ports CHOMPStation 6626
 	var/obj/item/stack/medical/advanced/ointment/O = new /obj/item/stack/medical/advanced/ointment(src)
 	var/obj/item/stack/medical/advanced/bruise_pack/B = new /obj/item/stack/medical/advanced/bruise_pack(src)
 	var/obj/item/stack/medical/splint/S = new /obj/item/stack/medical/splint(src)
+	//RS Edit start || ports CHOMPStation 6626
+	C.uses_charge = 1
+	C.charge_costs = list(5000)
+	C.synths = list(medicine)
+	//RS Edit end
 	O.uses_charge = 1
 	O.charge_costs = list(1000)
 	O.synths = list(medicine)

code/modules/reagents/reagent_containers/borghypo.dm

@@ -18,11 +18,14 @@
 	var/list/reagent_volumes = list()
 	var/list/reagent_names = list()
 
+//RS Edit Start || Ports CHOMPStation PR6626
+/*
 /obj/item/weapon/reagent_containers/borghypo/surgeon
 	reagent_ids = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone")
-
+*/
 /obj/item/weapon/reagent_containers/borghypo/crisis
-	reagent_ids = list("inaprovaline", "bicaridine", "kelotane", "anti_toxin", "dexalin", "tricordrazine", "spaceacillin", "tramadol")
+	reagent_ids = list("inaprovaline", "tricordrazine", "dexalin", "bicaridine", "kelotane", "anti_toxin", "spaceacillin", "tramadol", "adranol")
+//RS Edit End
 
 /obj/item/weapon/reagent_containers/borghypo/lost
 	reagent_ids = list("tricordrazine", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")