Cyborg Overhaul Booty+

Added dickgirl version of all bootyborgs and improved all of the sprites. Ported /tg/station's service, beaker, and circuit manipulator modules and upgrades for their respective borg types. Added rags, soap, crowbar, ect. to appropriate cyborg modules for quality of life improvment. Made similar changes to dog-borgs to bring them up to speed with the rest of the borg modules.

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

@@ -250,10 +250,12 @@
 		/obj/item/stack/rods/cyborg,
 		/obj/item/stack/tile/plasteel/cyborg,
 		/obj/item/extinguisher,
+		/obj/item/borg/apparatus/beaker/service,
 		/obj/item/pickaxe,
 		/obj/item/t_scanner/adv_mining_scanner,
 		/obj/item/restraints/handcuffs/cable/zipties,
 		/obj/item/soap/nanotrasen,
+		/obj/item/reagent_containers/rag,
 		/obj/item/borg/cyborghug)
 	emag_modules = list(/obj/item/melee/transforming/energy/sword/cyborg)
 	ratvar_modules = list(
@@ -269,6 +271,7 @@
 		/obj/item/assembly/flash/cyborg,
 		/obj/item/healthanalyzer,
 		/obj/item/reagent_containers/borghypo,
+		/obj/item/borg/apparatus/beaker,
 		/obj/item/reagent_containers/glass/beaker/large,
 		/obj/item/reagent_containers/dropper,
 		/obj/item/reagent_containers/syringe,
@@ -280,6 +283,9 @@
 		/obj/item/scalpel,
 		/obj/item/circular_saw,
 		/obj/item/extinguisher/mini,
+		/obj/item/soap/nanotrasen,
+		/obj/item/reagent_containers/rag,
+		/obj/item/crowbar/cyborg,
 		/obj/item/roller/robo,
 		/obj/item/borg/cyborghug/medical,
 		/obj/item/stack/medical/gauze/cyborg,
@@ -311,8 +317,11 @@
 		/obj/item/multitool/cyborg,
 		/obj/item/t_scanner,
 		/obj/item/analyzer,
+		/obj/item/borg/cyborghug,
+		/obj/item/reagent_containers/rag,
 		/obj/item/geiger_counter/cyborg,
 		/obj/item/assembly/signaler/cyborg,
+		/obj/item/holosign_creator/atmos,
 		/obj/item/areaeditor/blueprints/cyborg,
 		/obj/item/electroadaptive_pseudocircuit,
 		/obj/item/stack/sheet/metal/cyborg,
@@ -335,9 +344,15 @@
 	basic_modules = list(
 		/obj/item/assembly/flash/cyborg,
 		/obj/item/restraints/handcuffs/cable/zipties,
+		/obj/item/holosign_creator/security,
 		/obj/item/melee/baton/loaded,
 		/obj/item/gun/energy/disabler/cyborg,
+		/obj/item/reagent_containers/spray/pepper,
+		/obj/item/reagent_containers/rag,
 		/obj/item/clothing/mask/gas/sechailer/cyborg,
+		/obj/item/extinguisher/mini,
+		/obj/item/borg/cyborghug,
+		/obj/item/crowbar/cyborg,
 		/obj/item/pinpointer/crew)
 	emag_modules = list(/obj/item/gun/energy/laser/cyborg)
 	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
@@ -361,7 +376,9 @@
 		/obj/item/reagent_containers/borghypo/peace,
 		/obj/item/holosign_creator/cyborg,
 		/obj/item/borg/cyborghug/peacekeeper,
-		/obj/item/extinguisher,
+		/obj/item/extinguisher/mini,
+		/obj/item/reagent_containers/rag,
+		/obj/item/crowbar/cyborg,
 		/obj/item/borg/projectile_dampen)
 	emag_modules = list(/obj/item/reagent_containers/borghypo/peace/hacked)
 	ratvar_modules = list(
@@ -385,7 +402,9 @@
 		/obj/item/crowbar/cyborg,
 		/obj/item/stack/tile/plasteel/cyborg,
 		/obj/item/soap/nanotrasen,
+		/obj/item/reagent_containers/rag,
 		/obj/item/storage/bag/trash/cyborg,
+		/obj/item/borg/cyborghug,
 		/obj/item/extinguisher/mini,
 		/obj/item/mop/cyborg,
 		/obj/item/lightreplacer/cyborg,
@@ -434,7 +453,8 @@
 		/obj/item/bikehorn,
 		/obj/item/bikehorn/airhorn,
 		/obj/item/paint/anycolor,
-		/obj/item/soap/nanotrasen,
+		/obj/item/reagent_containers/rag,
+		/obj/item/cookiesynth,
 		/obj/item/pneumatic_cannon/pie/selfcharge/cyborg,
 		/obj/item/razor,					//killbait material
 		/obj/item/lipstick/purple,
@@ -442,7 +462,10 @@
 		/obj/item/borg/cyborghug/peacekeeper,
 		/obj/item/borg/lollipop/clown,
 		/obj/item/picket_sign/cyborg,
+		/obj/item/reagent_containers/borghypo/borgshaker,
 		/obj/item/reagent_containers/borghypo/clown,
+		/obj/item/borg/apparatus/beaker/service,
+		/obj/item/reagent_containers/glass/beaker/large,
 		/obj/item/extinguisher/mini)
 	emag_modules = list(
 		/obj/item/reagent_containers/borghypo/clown/hacked,
@@ -459,16 +482,20 @@
 	name = "Service"
 	basic_modules = list(
 		/obj/item/assembly/flash/cyborg,
-		/obj/item/reagent_containers/food/drinks/drinkingglass,
+		/obj/item/reagent_containers/glass/beaker/large,
+		/obj/item/borg/apparatus/beaker/service,
 		/obj/item/reagent_containers/food/condiment/enzyme,
 		/obj/item/pen,
 		/obj/item/toy/crayon/spraycan/borg,
 		/obj/item/extinguisher/mini,
 		/obj/item/hand_labeler/borg,
 		/obj/item/razor,
+		/obj/item/reagent_containers/rag,
+		/obj/item/crowbar/cyborg,
 		/obj/item/instrument/violin,
 		/obj/item/instrument/guitar,
 		/obj/item/rsf/cyborg,
+		/obj/item/borg/cyborghug,
 		/obj/item/reagent_containers/dropper,
 		/obj/item/lighter,
 		/obj/item/storage/bag/tray,
@@ -496,7 +523,9 @@
 		/obj/item/pickaxe/drill/cyborg,
 		/obj/item/shovel,
 		/obj/item/crowbar/cyborg,
+		/obj/item/reagent_containers/rag,
 		/obj/item/weldingtool/mini,
+		/obj/item/borg/cyborghug,
 		/obj/item/extinguisher/mini,
 		/obj/item/storage/bag/sheetsnatcher/borg,
 		/obj/item/t_scanner/adv_mining_scanner,

code/modules/research/designs/mechfabricator_designs.dm

@@ -704,7 +704,7 @@
 	materials = list(MAT_METAL=15000, MAT_GLASS=15000, MAT_SILVER=10000, MAT_GOLD=10000, MAT_TITANIUM=5000, MAT_DIAMOND=5000)
 	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
-	
+
 /datum/design/borg_upgrade_surgicalprocessor
 	name = "Cyborg Upgrade (Surgical Processor)"
 	id = "borg_upgrade_surgicalprocessor"
@@ -759,6 +759,15 @@
 	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
 
+/datum/design/borg_upgrade_circuit_app
+	name = "Cyborg Upgrade (Circuit Manipulator)"
+	id = "borg_upgrade_circuitapp"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/circuit_app
+	materials = list(MAT_METAL=2000, MAT_TITANIUM=500)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
 /datum/design/borg_upgrade_pinpointer
 	name = "Cyborg Upgrade (Crew pinpointer)"
 	id = "borg_upgrade_pinpointer"