From c8ecd7a8c1b4c55da3d666515f4adcd72b7de813 Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 18 Nov 2021 16:11:54 +0200 Subject: [PATCH 1/3] Makes mob renaming not exclusive to vore subtype Only a fraction of voremobs are actually vore subtype and the verbs can be just as useful for even non-voremobs. --- .../mob/living/simple_mob/subtypes/vore/vore.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index 178dee3cee2..8e0225168da 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -3,12 +3,12 @@ mob_bump_flag = 0 var/nameset -/mob/living/simple_mob/vore/Login() +/mob/living/simple_mob/Login() . = ..() - verbs |= /mob/living/simple_mob/vore/proc/set_name - verbs |= /mob/living/simple_mob/vore/proc/set_desc + verbs |= /mob/living/simple_mob/proc/set_name + verbs |= /mob/living/simple_mob/proc/set_desc -/mob/living/simple_mob/vore/proc/set_name() +/mob/living/simple_mob/proc/set_name() set name = "Set Name" set desc = "Sets your mobs name. You only get to do this once." set category = "Abilities" @@ -22,7 +22,7 @@ voice_name = newname nameset = 1 -/mob/living/simple_mob/vore/proc/set_desc() +/mob/living/simple_mob/proc/set_desc() set name = "Set Description" set desc = "Set your description." set category = "Abilities" @@ -32,4 +32,4 @@ desc = newdesc /mob/living/simple_mob/vore/aggressive - mob_bump_flag = HEAVY \ No newline at end of file + mob_bump_flag = HEAVY From 18069ef4bc6803b48a6635cedd1d9d0267acd72f Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 18 Nov 2021 16:15:17 +0200 Subject: [PATCH 2/3] Update vore.dm --- code/modules/mob/living/simple_mob/subtypes/vore/vore.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index 8e0225168da..de87f366930 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -1,6 +1,8 @@ /mob/living/simple_mob/vore mob_class = MOB_CLASS_ANIMAL mob_bump_flag = 0 + +/mob/living/simple_mob var/nameset /mob/living/simple_mob/Login() From 1c7825b553be330be1c6b3cb3476962b49f11ffb Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 18 Nov 2021 16:18:26 +0200 Subject: [PATCH 3/3] Adds a var toggle to allow multiple name changes --- code/modules/mob/living/simple_mob/subtypes/vore/vore.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index de87f366930..b15a7e0e188 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -4,6 +4,7 @@ /mob/living/simple_mob var/nameset + var/limit_renames = TRUE /mob/living/simple_mob/Login() . = ..() @@ -14,7 +15,7 @@ set name = "Set Name" set desc = "Sets your mobs name. You only get to do this once." set category = "Abilities" - if(nameset) + if(limit_renames && nameset) to_chat(src, "You've already set your name. Ask an admin to toggle \"nameset\" to 0 if you really must.") return var/newname