ee

code/modules/clothing/gloves/ring.dm

@@ -21,7 +21,7 @@
 	desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia."
 	icon_state = "ringdiamond"
 	item_state = "dring"
-	
+
 /obj/item/clothing/gloves/ring/diamond/attack_self(mob/user)
 	user.visible_message("<span class='warning'>\The [user] gets down on one knee, presenting \the [src].</span>","<span class='warning'>You get down on one knee, presenting \the [src].</span>")
 
@@ -30,3 +30,12 @@
 	desc = "A tiny silver ring, sized to wrap around a finger."
 	icon_state = "ringsilver"
 	item_state = "sring"
+
+/obj/item/clothing/gloves/ring/custom
+	name = " ring"
+	desc = "A ring."
+	gender = NEUTER
+	w_class = WEIGHT_CLASS_TINY
+	obj_flags = UNIQUE_RENAME
+	icon_state = "ringsilver"
+	item_state = "sring"

code/modules/clothing/under/accessories.dm

@@ -369,3 +369,12 @@
 	icon_state = "plastics"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 20, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = -40)
 	flags_inv = HIDEACCESSORY
+
+//necklace
+/obj/item/clothing/accessory/necklace
+	name = "necklace"
+	desc = "A necklace."
+	icon_state = "locket"
+	obj_flags = UNIQUE_RENAME
+	custom_materials = list(/datum/material/iron=100)
+	resistance_flags = FIRE_PROOF

code/modules/paperwork/pen.dm

@@ -147,7 +147,7 @@
 				log_game("[user] [key_name(user)] has renamed [O] to [input]")
 
 		if(penchoice == "Change description")
-			var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100)
+			var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 2048)
 			if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE))
 				return
 			O.desc = input