first commit with everything

code/modules/paperwork/pen.dm

@@ -105,12 +105,13 @@
 	custom_materials = list(/datum/material/gold = 750)
 	sharpness = SHARP_EDGED
 	resistance_flags = FIRE_PROOF
-	unique_reskin = list("Oak" = "pen-fountain-o",
-						"Gold" = "pen-fountain-g",
-						"Rosewood" = "pen-fountain-r",
-						"Black and Silver" = "pen-fountain-b",
-						"Command Blue" = "pen-fountain-cb"
-						)
+	unique_reskin = list(
+		"Oak" = list("icon_state" = "pen-fountain-o"),
+		"Gold" = list("icon_state" = "pen-fountain-g"),
+		"Rosewood" = list("icon_state" = "pen-fountain-r"),
+		"Black and Silver" = list("icon_state" = "pen-fountain-b"),
+		"Command Blue" = list("icon_state" = "pen-fountain-cb")
+	)
 	embedding = list("embed_chance" = 75)
 
 /obj/item/pen/fountain/captain/Initialize(mapload)
@@ -118,9 +119,10 @@
 	AddComponent(/datum/component/butchering, 200, 115) //the pen is mightier than the sword
 
 /obj/item/pen/fountain/captain/reskin_obj(mob/M)
-	..()
-	if(current_skin)
-		desc = "It's an expensive [current_skin] fountain pen. The nib is quite sharp."
+	. = ..()
+	if(!.)
+		return
+	desc = "It's an expensive [current_skin] fountain pen. The nib is quite sharp."
 
 /obj/item/pen/attack_self(mob/living/carbon/user)
 	var/deg = input(user, "What angle would you like to rotate the pen head to? (1-360)", "Rotate Pen Head") as null|num