Adds lumps of coal. (#22346)

tgstation · Dec 22, 2016 · 666f28a · 666f28a
1 parent 2122091
commit 666f28a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
@@ -67,3 +67,14 @@
 
 /obj/item/trash/attack(mob/M, mob/living/user)
 	return
+
+/obj/item/trash/coal
+	name = "lump of coal"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "slag"
+	desc = "Someone's gotten on the naughty list."
+
+/obj/item/trash/coal/burn()
+	visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
+	new /obj/item/weapon/ore/diamond(loc)
+	qdel(src)
diff --git a/code/game/objects/items/weapons/gift.dm b/code/game/objects/items/weapons/gift.dm
@@ -64,7 +64,8 @@
 		/obj/item/clothing/suit/poncho/green,
 		/obj/item/clothing/suit/poncho/red,
 		/obj/item/clothing/suit/snowman,
-		/obj/item/clothing/head/snowman)
+		/obj/item/clothing/head/snowman,
+		/obj/item/trash/coal)
 
 	gift_type_list += subtypesof(/obj/item/clothing/head/collectable)
 	gift_type_list += subtypesof(/obj/item/toy) - (((typesof(/obj/item/toy/cards) - /obj/item/toy/cards/deck) + /obj/item/toy/figure + /obj/item/toy/ammo)) //All toys, except for abstract types and syndicate cards.