cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 21:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

POLARIS: Rename make_nametag_name/desc

Browse Source
This commit is contained in:
Arokha Sieyes
2018-03-12 20:25:36 -04:00
parent 949ea35aa7
commit 13f506ba60
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/atoms.dm
View File

@@ -512,8 +512,8 @@
/atom/proc/AllowDrop() /atom/proc/AllowDrop()
return FALSE return FALSE
/atom/proc/make_nametag_name(mob/user) /atom/proc/get_nametag_name(mob/user)
return name 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 return "" //Desc itself is often too long to use

4
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1595,10 +1595,10 @@
//Else CRITICAL FAILURE! //Else CRITICAL FAILURE!
return "" 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? 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 = "" var/msg = ""
if(hasHUD(user,"security")) if(hasHUD(user,"security"))
//Try to find their name //Try to find their name

2
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -1722,5 +1722,5 @@
retaliate = 1 retaliate = 1
destroy_surroundings = 1 destroy_surroundings = 1
/mob/living/simple_animal/make_nametag_desc(mob/user) /mob/living/simple_animal/get_nametag_desc(mob/user)
return "<i>tt_desc</i>" return "<i>tt_desc</i>"

2
code/modules/mob/mob.dm
View File

@@ -1146,7 +1146,7 @@ mob/proc/yank_out_object()
/mob/MouseEntered(location, control, params) /mob/MouseEntered(location, control, params)
if(usr != src && usr.is_preference_enabled(/datum/client_preference/mob_tooltips)) 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))
..() ..()