cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/multiz/movement.dm
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-6_surface.dmm
This commit is contained in:
skull132
2018-01-21 23:51:44 +02:00
parent 2fddb0a25c 5dd6e0e2a0
commit 1e973b2d6a
36 changed files with 463 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/defines/procs/announce.dm
View File

@@ -119,6 +119,8 @@ datum/announcement/proc/Log(message as text, message_title as text)
message_admins("[key_name_admin(usr)] has made \a [announcement_type].", 1)
/proc/GetNameAndAssignmentFromId(var/obj/item/weapon/card/id/I)
if(!I)
return "Unknown"
// Format currently matches that of newscaster feeds: Registered Name (Assigned Rank)
return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name