Merge pull request #11101 from FalseIncarnate/fluff

Benjaminfallout Fluff Item
This commit is contained in:
variableundefined
2019-03-23 20:02:51 +08:00
committed by GitHub
3 changed files with 25 additions and 2 deletions
+3 -1
View File
@@ -6,6 +6,7 @@
icon_state = "ironring"
item_state = ""
icon = 'icons/obj/clothing/rings.dmi'
var/fluff_material = FALSE //If true, will ignore the material when examining
var/material = "iron"
var/stud = 0
@@ -21,7 +22,8 @@
/obj/item/clothing/gloves/ring/examine(mob/user)
..(user)
to_chat(user, "This one is made of [material].")
if(!fluff_material)
to_chat(user, "This one is made of [material].")
if(stud)
to_chat(user, "It is adorned with a single gem.")
+22 -1
View File
@@ -1752,4 +1752,25 @@
icon_state = "kiamask"
item_state = "kiamask"
item_color = "kiamask"
species_restricted = list("Vox")
species_restricted = list("Vox")
/obj/item/clothing/gloves/ring/fluff
name = "fluff ring"
desc = "Someone forgot to set this fluff item's description, notify a coder!"
icon = 'icons/obj/custom_items.dmi'
fluff_material = TRUE
/obj/item/clothing/gloves/ring/fluff/update_icon()
return
/obj/item/clothing/gloves/ring/fluff/attackby(obj/item/I as obj, mob/user as mob, params)
return
/obj/item/clothing/gloves/ring/fluff/benjaminfallout //Benjaminfallout: Pretzel Brassheart
name = "Pretzel's Ring"
desc = "A small platinum ring with a large light blue diamond. Engraved inside the band are the words: 'To my lovely Pristine Princess. Forever yours, Savinien.'"
icon_state = "benjaminfallout_ring"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB