Merge branch 'master' into upstream-merge-8298

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

@@ -155,7 +155,7 @@
 
 /obj/item/borg/upgrade/advhealth
 	name = "advanced health analyzer module"
-	desc = "A carbon dioxide jetpack suitable for low-gravity operations."
+	desc = "An Advanced Health Analyzer, optimized for borg mounting."
 	icon_state = "cyborg_upgrade3"
 	item_state = "cyborg_upgrade"
 	require_module = 1
@@ -214,4 +214,4 @@
 	R.add_language(LANGUAGE_TERMINUS, 1)
 	R.add_language(LANGUAGE_ZADDAT, 1)
 
-	return 1
+	return 1

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

@@ -66,3 +66,93 @@
 		to_chat(usr, "Internal capacity doubled.")
 		T.upgraded_capacity = TRUE
 	return 1
+
+//Advanced RPED
+/obj/item/borg/upgrade/advrped
+	name = "Advanced Rapid Part Exchange Device"
+	desc = "An ARPED, now in borg size!"
+	icon_state = "cyborg_upgrade3"
+	item_state = "cyborg_upgrade"
+	module_flags = BORG_MODULE_SCIENCE
+	require_module = 1
+
+/obj/item/borg/upgrade/advrped/action(var/mob/living/silicon/robot/R)
+	if(..()) return 0
+
+	var/obj/item/weapon/storage/part_replacer/adv/T = locate() in R.module
+
+	if(!R.module || !(type in R.module.supported_upgrades))
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 0
+	if(!T)
+		T = locate() in R.module.contents
+	if(!T)
+		T = locate() in R.module.modules
+	if(!T)
+		R.module.modules += new/obj/item/weapon/storage/part_replacer/adv(R.module)
+		return 1
+	if(T)
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 0
+
+//Diamond Drill
+/obj/item/borg/upgrade/diamonddrill
+	name = "Mounted Diamond Drill"
+	desc = "An advanced drill, optimized for borg use."
+	icon_state = "cyborg_upgrade3"
+	item_state = "cyborg_upgrade"
+	module_flags = BORG_MODULE_MINER
+	require_module = 1
+
+/obj/item/borg/upgrade/diamonddrill/action(var/mob/living/silicon/robot/R)
+	if(..()) return 0
+
+	var/obj/item/weapon/pickaxe/diamonddrill/T = locate() in R.module
+
+	if(!R.module || !(type in R.module.supported_upgrades))
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 0
+	if(!T)
+		T = locate() in R.module.contents
+	if(!T)
+		T = locate() in R.module.modules
+	if(!T)
+		R.module.modules += new/obj/item/weapon/pickaxe/diamonddrill(R.module)
+		return 1
+	if(T)
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 0
+
+//PKA
+/obj/item/borg/upgrade/pka
+	name = "Protokenetic Accelerator Upgrade"
+	desc = "A borg mounted PKA Rifle for use in mining and wildlife defense."
+	icon_state = "cyborg_upgrade3"
+	item_state = "cyborg_upgrade"
+	module_flags = BORG_MODULE_MINER
+	require_module = 1
+
+/obj/item/borg/upgrade/pka/action(var/mob/living/silicon/robot/R)
+	if(..()) return 0
+
+	var/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg/T = locate() in R.module
+
+	if(!R.module || !(type in R.module.supported_upgrades))
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 0
+	if(!T)
+		T = locate() in R.module.contents
+	if(!T)
+		T = locate() in R.module.modules
+	if(!T)
+		R.module.modules += new/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(R.module)
+		return 1
+	if(T)
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 0