what

code/modules/paperwork/paperplane.dm

@@ -102,7 +102,7 @@
 /obj/item/paperplane/throw_impact(atom/hit_atom)
 	if(iscarbon(hit_atom))
 		var/mob/living/carbon/C = hit_atom
-		if(!C.get_active_held_item() && !C.restrained())
+		if(C.can_catch_item(TRUE))
 			var/datum/action/innate/origami/origami_action = locate() in C.actions
 			if(origami_action?.active) //if they're a master of origami and have the ability turned on, force throwmode on so they'll automatically catch the plane.
 				C.throw_mode_on()

code/modules/paperwork/pen.dm

@@ -23,7 +23,7 @@
 	throw_range = 7
 	materials = list(MAT_METAL=10)
 	pressure_resistance = 2
-	grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
+	grind_results = list("iron" = 2, "iodine" = 1)
 	var/colour = "black"	//what colour the ink is!
 	var/degrees = 0
 	var/font = PEN_FONT
@@ -165,9 +165,9 @@
 /obj/item/pen/sleepy/Initialize()
 	. = ..()
 	create_reagents(45, OPENCONTAINER)
-	reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 20)
-	reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 15)
-	reagents.add_reagent(/datum/reagent/toxin/staminatoxin, 10)
+	reagents.add_reagent("chloralhydrate", 20)
+	reagents.add_reagent("mutetoxin", 15)
+	reagents.add_reagent("tirizene", 10)
 
 /*
  * (Alan) Edaggers

code/modules/paperwork/photocopier.dm

@@ -335,6 +335,6 @@
 	name = "toner cartridge"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "tonercartridge"
-	grind_results = list(/datum/reagent/iodine = 40, /datum/reagent/iron = 10)
+	grind_results = list("iodine" = 40, "iron" = 10)
 	var/charges = 5
 	var/max_charges = 5