From 13f506ba6092ea74c7085d4d25e20e5056b23edd Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 12 Mar 2018 20:25:36 -0400 Subject: [PATCH] POLARIS: Rename make_nametag_name/desc --- code/game/atoms.dm | 4 ++-- code/modules/mob/living/carbon/human/human.dm | 4 ++-- code/modules/mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/mob/mob.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index c396a54839..e18970802e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -512,8 +512,8 @@ /atom/proc/AllowDrop() return FALSE -/atom/proc/make_nametag_name(mob/user) +/atom/proc/get_nametag_name(mob/user) return name -/atom/proc/make_nametag_desc(mob/user) +/atom/proc/get_nametag_desc(mob/user) return "" //Desc itself is often too long to use diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index df0a9333b7..facc1ac438 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1595,10 +1595,10 @@ //Else CRITICAL FAILURE! return "" -/mob/living/carbon/human/make_nametag_name(mob/user) +/mob/living/carbon/human/get_nametag_name(mob/user) return name //Could do fancy stuff here? -/mob/living/carbon/human/make_nametag_desc(mob/user) +/mob/living/carbon/human/get_nametag_desc(mob/user) var/msg = "" if(hasHUD(user,"security")) //Try to find their name diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index e6f584708b..cde93f797d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -1722,5 +1722,5 @@ retaliate = 1 destroy_surroundings = 1 -/mob/living/simple_animal/make_nametag_desc(mob/user) +/mob/living/simple_animal/get_nametag_desc(mob/user) return "tt_desc" diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index f9f09be42f..cb3dc7e2ab 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1146,7 +1146,7 @@ mob/proc/yank_out_object() /mob/MouseEntered(location, control, params) if(usr != src && usr.is_preference_enabled(/datum/client_preference/mob_tooltips)) - openToolTip(user = usr, tip_src = src, params = params, title = make_nametag_name(usr), content = make_nametag_desc(usr)) + openToolTip(user = usr, tip_src = src, params = params, title = get_nametag_name(usr), content = get_nametag_desc(usr)) ..()