mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] Ring/Watch Accessory Transfer (#9489)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
cc1e6f932e
commit
f7e9f8d12b
@@ -198,7 +198,7 @@
|
||||
name = "Phi's Personal Items"
|
||||
has_items = list(
|
||||
/obj/item/clothing/accessory/medal/bronze_heart,
|
||||
/obj/item/clothing/gloves/ring/seal/signet/fluff/phi)
|
||||
/obj/item/clothing/accessory/ring/seal/signet/fluff/phi)
|
||||
|
||||
// Tabiranth: Ascian
|
||||
/obj/item/grenade/spawnergrenade/spirit
|
||||
|
||||
@@ -1689,14 +1689,14 @@ Departamental Swimsuits, for general use
|
||||
item_state = "kilanosuit_p_mob"
|
||||
|
||||
//Mewchild: Phi Vietsi
|
||||
/obj/item/clothing/gloves/ring/seal/signet/fluff/phi
|
||||
/obj/item/clothing/accessory/ring/seal/signet/fluff/phi
|
||||
name = "Phi's Bone Signet Ring"
|
||||
desc = "A signet ring belonging to Phi, carved from the bones of something long extinct, as a ward against bad luck."
|
||||
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "phi_ring"
|
||||
|
||||
/obj/item/clothing/gloves/ring/seal/signet/fluff/phi/change_name(var/signet_name = "Unknown")
|
||||
/obj/item/clothing/accessory/ring/seal/signet/fluff/phi/change_name(var/signet_name = "Unknown")
|
||||
name = "[signet_name]'s Bone Signet Ring"
|
||||
desc = "A signet ring belonging to [signet_name], carved from the bones of something long extinct, as a ward against bad luck."
|
||||
|
||||
@@ -1953,12 +1953,13 @@ Departamental Swimsuits, for general use
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
|
||||
//CappyCat:Cappy Fuzzlyfeathers
|
||||
/obj/item/clothing/accessory/watch
|
||||
/obj/item/clothing/accessory/watch/custom
|
||||
name = "silver pocket watch"
|
||||
desc = "A fancy silver-plated digital pocket watch. Looks expensive."
|
||||
icon = 'icons/obj/deadringer.dmi'
|
||||
icon_state = "deadringer"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
slot = ACCESSORY_SLOT_INSIGNIA
|
||||
slot_flags = SLOT_ID | SLOT_BELT | SLOT_TIE
|
||||
|
||||
//Pimientopyro:Zaku Fyodorovna
|
||||
@@ -2676,7 +2677,8 @@ End CHOMP Removal*/
|
||||
|
||||
//Halored: Mercury
|
||||
|
||||
/* /obj/item/clothing/gloves/ring/material/void_opal/fluff/mercury //Chomp REMOVE Start
|
||||
/* Chomp REMOVE Start
|
||||
/obj/item/clothing/accessory/ring/material/void_opal/fluff/mercury
|
||||
name = "Mercury's Mate Ring"
|
||||
desc = "A band of void opal, given to Mercury by Lumen"
|
||||
|
||||
|
||||
@@ -1289,7 +1289,7 @@
|
||||
|
||||
//Basir Fahim
|
||||
|
||||
/obj/item/clothing/gloves/ring/fluff/basir
|
||||
/obj/item/clothing/accessory/ring/fluff/basir
|
||||
name = "Sundancer Engagement Ring"
|
||||
desc = "This ring is stylized to have an ornate sun, with a sample of phoron swirling around inside. Keep away from Fire! Inscribed along the band is a sentence in Siik; \"Always yours, my little frost-fire. With love. -Sheri\""
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
|
||||
Reference in New Issue
Block a user