log_and_message_admins fix

ss220-space · Jan 22, 2025 · 0f3b726 · 0f3b726
1 parent ceda703
commit 0f3b726
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
@@ -86,7 +86,7 @@
 		message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
 	if(new_level == SEC_LEVEL_EPSILON)
 		// episilon is delayed... but we still want to log it
-		log_and_message_admins("[key_name_admin(usr)] has changed the security level to epsilon.")
+		log_and_message_admins("has changed the security level to epsilon.")
 
 /obj/machinery/computer/communications/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
 	if(..())

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
@@ -942,7 +942,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 
 		var/mob/living/simple_animal/possessed_object/tomob = new(toitem)
 
-		log_and_message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].")
+		log_and_message_admins("has put [frommob.ckey] in control of [tomob.name].")
 		SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag")
 
 		tomob.ckey = frommob.ckey
@@ -967,7 +967,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 		if(tomob.client) //no need to ghostize if there is no client
 			tomob.ghostize(0)
 
-		log_and_message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].")
+		log_and_message_admins("has put [frommob.ckey] in control of [tomob.name].")
 		SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag")
 
 		tomob.ckey = frommob.ckey
@@ -986,7 +986,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 		if(QDELETED(frommob) || QDELETED(tothing)) //make sure the mobs don't go away while we waited for a response
 			return TRUE
 
-		log_and_message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of an empty AI core.")
+		log_and_message_admins("has put [frommob.ckey] in control of an empty AI core.")
 		SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag")
 
 		var/transfer_key = frommob.key // frommob is qdel'd in frommob.AIize()

diff --git a/code/modules/admin/verbs/asays.dm b/code/modules/admin/verbs/asays.dm
@@ -1,6 +1,11 @@
 GLOBAL_LIST_EMPTY(asays)
 GLOBAL_LIST_EMPTY(msays)
 
+
+/**
+	* #Special says datum
+	* Used to store the history of special chat messages (achat, mchat, devchat) within a round
+**/
 /datum/say
 	var/ckey
 	var/rank

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -100,12 +100,12 @@
 	var/minhours
 	ADD_TRAIT(offer_mob, TRAIT_BEING_OFFERED, ADMIN_OFFER_TRAIT)
 	to_chat(offer_mob, span_warning("Призракам предложен контроль над вашим существом."))
-	log_admin("[key_name(usr)] has offered control of ([key_name(offer_mob)]) to ghosts.")
 	if(!hours)
 		minhours = tgui_input_number(usr, "Минимальное количество часов, необходимое для игры на [offer_mob]?", "Установите число часов", 10)
 	else
 		minhours = hours
-	message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(offer_mob)]) to ghosts with [minhours] hrs playtime")
+
+	log_and_message_admins("has offered control of ([key_name_admin(offer_mob)]) to ghosts with [minhours] hrs playtime")
 	var/question = "Вы хотите войти в раунд как [offer_mob.real_name ? offer_mob.real_name : offer_mob][offer_mob.job ? " ([offer_mob.job])" : ""]"
 	if(isnull(hide_role))
 		if(tgui_alert(usr, "Вы хотите показывать спец-роль существа?","Показывать спец-роль", list("Да","Нет")) == "Да")