From 4691c60ff2bcc5cbcd6ece57d3eb348d9cab6df7 Mon Sep 17 00:00:00 2001 From: Kenionatus Date: Wed, 16 Oct 2024 10:22:31 +0200 Subject: [PATCH 1/3] move GetNameAndAssignmentFromId to cards_ids file --- code/defines/procs/announcer_datum.dm | 4 ---- code/game/objects/items/weapons/cards_ids.dm | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/defines/procs/announcer_datum.dm b/code/defines/procs/announcer_datum.dm index c0dad40bc433..39c97ec8990d 100644 --- a/code/defines/procs/announcer_datum.dm +++ b/code/defines/procs/announcer_datum.dm @@ -137,10 +137,6 @@ GLOBAL_DATUM_INIT(major_announcement, /datum/announcer, new(config_type = /datum log_game("[key_name(usr)] has made \a [config.log_name]: [message_title] - [message] - [author]") message_admins("[key_name_admin(usr)] has made \a [config.log_name].", 1) -/proc/GetNameAndAssignmentFromId(obj/item/card/id/I) - // Format currently matches that of newscaster feeds: Registered Name (Assigned Rank) - return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name - /datum/announcement_configuration/event default_title = ANNOUNCE_KIND_EVENT sound = sound('sound/misc/notice2.ogg') diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 5e5a6e874050..3ac3bb733c56 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -1191,3 +1191,7 @@ return "Thunderdome Green" else return capitalize(skin) + +/proc/GetNameAndAssignmentFromId(obj/item/card/id/I) + // Format currently matches that of newscaster feeds: Registered Name (Assigned Rank) + return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name From e4d10543aaec4cefdc5f02d1aaa5256cd50a9d57 Mon Sep 17 00:00:00 2001 From: Kenionatus Date: Wed, 16 Oct 2024 10:25:20 +0200 Subject: [PATCH 2/3] simplyfiy and fix newscaster's get_scanned_user Use human/get_id_card proc instead of custom solution. --- code/modules/newscaster/obj/newscaster.dm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index f086ec662bb2..393e59f3549d 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -647,16 +647,8 @@ GLOBAL_LIST_EMPTY(allNewscasters) if(ishuman(user)) var/mob/living/carbon/human/M = user // No ID, no luck - if(!M.wear_id) - return - // Try to get the ID - var/obj/item/card/id/ID - if(istype(M.wear_id, /obj/item/pda)) - var/obj/item/pda/P = M.wear_id - ID = P.id - else if(istype(M.wear_id, /obj/item/card/id)) - ID = M.wear_id - if(istype(ID)) + var/obj/item/card/id/ID = M.get_id_card() + if(ID) return list(name = "[ID.registered_name] ([ID.assignment])", security = has_access(list(), list(ACCESS_SECURITY), ID.access)) else if(issilicon(user)) var/mob/living/silicon/ai_user = user From b006b5e44e4818a42748bfb868bc4c86aecf8f74 Mon Sep 17 00:00:00 2001 From: Kenionatus Date: Wed, 16 Oct 2024 10:26:09 +0200 Subject: [PATCH 3/3] rename M to human_user --- code/modules/newscaster/obj/newscaster.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index 393e59f3549d..c321def650f4 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -645,9 +645,9 @@ GLOBAL_LIST_EMPTY(allNewscasters) /obj/machinery/newscaster/proc/get_scanned_user(mob/user) . = list(name = "Unknown", security = user.can_admin_interact()) if(ishuman(user)) - var/mob/living/carbon/human/M = user + var/mob/living/carbon/human/human_user = user // No ID, no luck - var/obj/item/card/id/ID = M.get_id_card() + var/obj/item/card/id/ID = human_user.get_id_card() if(ID) return list(name = "[ID.registered_name] ([ID.assignment])", security = has_access(list(), list(ACCESS_SECURITY), ID.access)) else if(issilicon(user))