Gives medical borgs surgery tools, ointment, and bandages by default. Upgrade module now give upgraded hypo and a defib. Borg hypo also states what chemical is being injected.

code/game/machinery/rechargestation.dm

@@ -205,7 +205,9 @@
 							// Engineering
 							if(istype(O,/obj/item/stack/sheet/metal) || istype(O,/obj/item/stack/sheet/rglass) || istype(O,/obj/item/stack/sheet/glass) || istype(O,/obj/item/weapon/cable_coil))
 								if(O:amount < 50)
-									O:amount += 1
+									O:amount += 2
+								if(O:amount > 50)
+									O:amount = 50
 							// Security
 							if(istype(O,/obj/item/device/flash))
 								if(O:broken)
@@ -231,6 +233,14 @@
 								var/obj/item/weapon/reagent_containers/glass/bottle/robot/B = O
 								if(B.reagent && (B.reagents.get_reagent_amount(B.reagent) < B.volume))
 									B.reagents.add_reagent(B.reagent, 2)
+							if(istype(O,/obj/item/stack/medical/bruise_pack) || istype(O,/obj/item/stack/medical/ointment))
+								if(O:amount < O:max_amount)
+									O:amount += 2
+								if(O:amount > O:max_amount)
+									O:amount = O:max_amount
+							if(istype(O,/obj/item/weapon/melee/defibrillator))
+								var/obj/item/weapon/melee/defibrillator/D = O
+								D.charges = initial(D.charges)
 							//Janitor
 							if(istype(O, /obj/item/device/lightreplacer))
 								var/obj/item/device/lightreplacer/LR = O

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

@@ -39,7 +39,7 @@
 
 /obj/item/borg/upgrade/medical/surgery
 	name = "medical module board"
-	desc = "Used to give a medical cyborg surgery tools."
+	desc = "Used to give a medical cyborg advanced care tools."
 	icon_state = "cyborg_upgrade"
 	construction_cost = list("metal"=80000 , "glass"=6000)
 	require_module = 1
@@ -51,7 +51,7 @@
 		usr << "There's no mounting point for the module!"
 		return 0
 	else
-		R.module.modules += new/obj/item/weapon/circular_saw
+/*		R.module.modules += new/obj/item/weapon/circular_saw
 		R.module.modules += new/obj/item/weapon/scalpel
 		R.module.modules += new/obj/item/weapon/bonesetter
 		R.module.modules += new/obj/item/weapon/bonegel // Requested by Hoshi-chan
@@ -59,7 +59,9 @@
 		R.module.modules += new/obj/item/weapon/surgicaldrill
 		R.module.modules += new/obj/item/weapon/cautery
 		R.module.modules += new/obj/item/weapon/hemostat
-		R.module.modules += new/obj/item/weapon/retractor
+		R.module.modules += new/obj/item/weapon/retractor*/
+		R.module.modules += new/obj/item/weapon/melee/defibrillator
+		R.module.modules += new /obj/item/weapon/reagent_containers/borghypo/upgraded(src)
 
 		return 1
 

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

@@ -74,12 +74,46 @@
 		src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
 		src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
 		src.modules += new /obj/item/weapon/extinguisher/mini(src)
+		src.modules += new /obj/item/weapon/circular_saw
+		src.modules += new /obj/item/weapon/scalpel
+		src.modules += new /obj/item/weapon/bonesetter
+		src.modules += new /obj/item/weapon/bonegel
+		src.modules += new /obj/item/weapon/FixOVein
+		src.modules += new /obj/item/weapon/surgicaldrill
+		src.modules += new /obj/item/weapon/cautery
+		src.modules += new /obj/item/weapon/hemostat
+		src.modules += new /obj/item/weapon/retractor
 		src.emag = new /obj/item/weapon/reagent_containers/spray(src)
 
 		src.emag.reagents.add_reagent("pacid", 250)
 		src.emag.name = "Polyacid spray"
+
+		var/obj/item/stack/medical/bruise_pack/B = new /obj/item/stack/medical/bruise_pack(src)
+		B.max_amount = 15
+		B.amount = 15
+		src.modules += B
+
+		var/obj/item/stack/medical/ointment/O = new /obj/item/stack/medical/ointment(src)
+		O.max_amount = 15
+		O.amount = 15
+		src.modules += O
+
 		return
 
+	respawn_consumable(var/mob/living/silicon/robot/R)
+		var/list/what = list (
+			/obj/item/stack/medical/bruise_pack,
+			/obj/item/stack/medical/ointment,
+		)
+		for (var/T in what)
+			if (!(locate(T) in src.modules))
+				src.modules -= null
+				var/O = new T(src)
+				if(istype(O,/obj/item/stack/medical))
+					O:max_amount = 15
+				src.modules += O
+				O:amount = 1
+		return
 
 
 /obj/item/weapon/robot_module/engineering

code/modules/reagents/reagent_containers/borghydro.dm

@@ -55,12 +55,12 @@
 // Use this to add more chemicals for the borghypo to produce.
 /obj/item/weapon/reagent_containers/borghypo/proc/add_reagent(var/reagent)
 	reagent_ids |= reagent
-	var/datum/reagents/RG = new(30)
+	var/datum/reagents/RG = new(volume)
 	RG.my_atom = src
 	reagent_list += RG
 
 	var/datum/reagents/R = reagent_list[reagent_list.len]
-	R.add_reagent(reagent, 30)
+	R.add_reagent(reagent, volume)
 
 /obj/item/weapon/reagent_containers/borghypo/attack(mob/M as mob, mob/user as mob)
 	var/datum/reagents/R = reagent_list[mode]
@@ -105,3 +105,13 @@
 
 	if(empty)
 		usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more."
+
+	var/datum/reagent/R = chemical_reagents_list[reagent_ids[mode]]
+	usr << "\blue It is currently producing '[R.name]'."
+
+/obj/item/weapon/reagent_containers/borghypo/upgraded
+	name = "Upgraded Cyborg Hypospray"
+	desc = "An upgraded hypospray with more potent chemicals and a larger storage capacity."
+	reagent_ids = list("doctorsdelight", "dexalinp", "spaceacillin")
+	volume = 50
+	recharge_time = 3 //Time it takes for shots to recharge (in seconds)