diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 4daa297a3eb..4d70b883867 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -28,6 +28,19 @@
 	//Item currently being held.
 	var/obj/item/wrapped = null
 
+/obj/item/weapon/gripper/paperwork
+	name = "paperwork gripper"
+	desc = "A simple grasping tool for clerical work."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "gripper"
+
+	can_hold = list(
+		/obj/item/weapon/clipboard,
+		/obj/item/weapon/paper,
+//		/obj/item/weapon/paper_bundle,
+		/obj/item/weapon/card/id
+		)
+
 /obj/item/weapon/gripper/attack_self(mob/user as mob)
 	if(wrapped)
 		wrapped.attack_self(user)
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 00d1b0abf0c..0536b07fd44 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -114,7 +114,7 @@
 				mode = 1
 			user << "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'"
 
-		return
+	return
 
 // Copied over from paper's rename verb
 // see code\modules\paperwork\paper.dm line 62
@@ -132,12 +132,33 @@
 	add_fingerprint(user)
 	return
 
+//TODO: Add prewritten forms to dispense when you work out a good way to store the strings.
 /obj/item/weapon/form_printer
-	name = "paperwork printer"
+	//name = "paperwork printer"
+	name = "paper dispenser"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper_bin1"
 	item_state = "sheet-metal"
 
+/obj/item/weapon/form_printer/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	return
+
+/obj/item/weapon/form_printer/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
+
+	if(!target || !flag)
+		return
+
+	if(istype(target,/obj/structure/table))
+		deploy_paper(get_turf(target))
+
+/obj/item/weapon/form_printer/attack_self(mob/user as mob)
+	deploy_paper(get_turf(src))
+
+/obj/item/weapon/form_printer/proc/deploy_paper(var/turf/T)
+	T.visible_message("\blue \The [src.loc] dispenses a sheet of crisp white paper.")
+	new /obj/item/weapon/paper(T)
+
+
 //Personal shielding for the combat module.
 /obj/item/borg/combat/shield
 	name = "personal shielding"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index fb933b99f5e..b0628c56e4d 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -259,8 +259,7 @@
 		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
-		src.modules += new /obj/item/weapon/pen/robopen(src)
-		src.modules += new /obj/item/weapon/razor(src)
+
 		var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
 		M.matter = 30
 		src.modules += M
@@ -290,6 +289,10 @@
 		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/weapon/pen/robopen(src)
+		src.modules += new /obj/item/weapon/form_printer(src)
+		src.modules += new /obj/item/weapon/gripper/paperwork(src)
+
+		src.emag = new /obj/item/weapon/stamp/denied(src)
 
 	add_languages(var/mob/living/silicon/robot/R)
 		R.add_language("Sol Common", 1)
@@ -317,6 +320,7 @@
 		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/borg/sight/meson(src)
 		src.modules += new /obj/item/weapon/wrench(src)
+		src.modules += new /obj/item/weapon/screwdriver(src)
 		src.modules += new /obj/item/weapon/storage/bag/ore(src)
 		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
 		src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)