cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-27 23:16:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into protRig

Browse Source
This commit is contained in:
Kashargul
2024-11-27 23:58:52 +01:00
committed by GitHub
parent 5c5b740e26 05b28bac9e
commit 2fdde73d3a
281 changed files with 3627 additions and 3318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+1 -1
View File
@@ -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
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+5 -4
View File
@@ -1687,14 +1687,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."
@@ -1951,12 +1951,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
@@ -2708,7 +2709,7 @@ Departamental Swimsuits, for general use
//Halored: Mercury
/obj/item/clothing/gloves/ring/material/void_opal/fluff/mercury
/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"