From 6af91caf6ba4fce36de797c6deb503f7a4834cd6 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Sat, 17 Feb 2018 23:02:41 -0600 Subject: [PATCH 1/2] Ringfix v2 --- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index bf3e1eba732..bd451862b5a 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1697,6 +1697,19 @@ Departamental Swimsuits, for general use icon_state = "vietsi_ring" var/nameset = 0 +/obj/item/clothing/gloves/ring/seal/fluff/vietsi/attack_self(mob/user) + if(nameset) + to_chat(user, "The [src] has already been claimed!") + return + + to_chat(user, "You claim the [src] as your own!") + change_name(user) + nameset = 1 + +/obj/item/clothing/gloves/ring/seal/fluff/vietsi/proc/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." + //KotetsuRedwood:Latex Maid Dresses, for everyone to 'enjoy'. :3c /obj/item/clothing/under/fluff/latexmaid name = "latex maid dress" From f34a0f104e5b6c5ef181d4022ca3ff7cf1873bea Mon Sep 17 00:00:00 2001 From: Leshana Date: Sun, 18 Feb 2018 00:47:10 -0500 Subject: [PATCH 2/2] Revert adding unnecessary proc and fixing paths for vietsi custom item. --- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 14 ++------------ config/custom_items.txt | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index bd451862b5a..d0799596198 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1689,24 +1689,14 @@ Departamental Swimsuits, for general use species_restricted = null //Mewchild: Phi Vietsi -/obj/item/clothing/gloves/ring/seal/fluff/vietsi +/obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi name = "signet ring" desc = "A signet ring carved from the bones of something long extinct, as a ward against bad luck." icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "vietsi_ring" - var/nameset = 0 -/obj/item/clothing/gloves/ring/seal/fluff/vietsi/attack_self(mob/user) - if(nameset) - to_chat(user, "The [src] has already been claimed!") - return - - to_chat(user, "You claim the [src] as your own!") - change_name(user) - nameset = 1 - -/obj/item/clothing/gloves/ring/seal/fluff/vietsi/proc/change_name(var/signet_name = "Unknown") +/obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi/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." diff --git a/config/custom_items.txt b/config/custom_items.txt index 4e5847c0330..2838ffda014 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -498,7 +498,7 @@ item_path: /obj/item/weapon/implanter/reagent_generator/savannah { ckey: mewchild character_name: Phi Vietsi -item_path: /obj/item/clothing/gloves/ring/seal/fluff/vietsi +item_path: /obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi } {