diff --git a/code/game/atoms.dm b/code/game/atoms.dm index e18970802e4..5e9d6e3d81e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -260,7 +260,7 @@ //He has no prints! if (mFingerprints in M.mutations) if(fingerprintslast != M.key) - fingerprintshidden += "(Has no fingerprints) Real name: [M.real_name], Key: [M.key]" + fingerprintshidden += "[time_stamp()]: [key_name(M)] (No fingerprints mutation)" fingerprintslast = M.key return 0 //Now, lets get to the dirty work. //First, make sure their DNA makes sense. @@ -274,7 +274,7 @@ //Now, deal with gloves. if (H.gloves && H.gloves != src) if(fingerprintslast != H.key) - fingerprintshidden += text("\[[]\](Wearing gloves). Real name: [], Key: []",time_stamp(), H.real_name, H.key) + fingerprintshidden += "[time_stamp()]: [key_name(H)] (Wearing [H.gloves])" fingerprintslast = H.key H.gloves.add_fingerprint(M) @@ -288,7 +288,7 @@ //More adminstuffz if(fingerprintslast != H.key) - fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), H.real_name, H.key) + fingerprintshidden += "[time_stamp()]: [key_name(H)]" fingerprintslast = H.key //Make the list if it does not exist. @@ -341,7 +341,7 @@ else //Smudge up dem prints some if(fingerprintslast != M.key) - fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), M.real_name, M.key) + fingerprintshidden += "[time_stamp()]: [key_name(M)]" fingerprintslast = M.key //Cleaning up shit. diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 1661fcc5827..9eeeb05d4a9 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -366,6 +366,8 @@ proc/get_radio_key_from_channel(var/channel) qdel(I) //Log the message to file + if(message_mode) + message = "([message_mode == "headset" ? "Common" : capitalize(message_mode)]) [message]" //Adds radio keys used if available if(whispering) log_whisper(message,src) else diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 0cd997cdfa1..68a8ff57255 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -234,7 +234,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 tmob.resting = 1 //Force them down to the ground. //Log it for admins (as opposed to walk which logs damage) - add_attack_logs(src,tmob,"Pinned underfoot") + add_attack_logs(src,tmob,"Pinned underfoot (run, no halloss)") //Not a human, or not a taur, generic message only if(!H || !isTaurTail(H.tail_style)) @@ -256,7 +256,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 tmob.resting = 1 //Log it for admins (as opposed to run which logs no damage) - add_attack_logs(src,tmob,"Pinned underfoot (+HALLOSS)") + add_attack_logs(src,tmob,"Pinned underfoot (walk, about [damage] halloss)") //Not a human, or not a taur, generic message only if(!H || !isTaurTail(H.tail_style)) @@ -307,7 +307,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 for(var/obj/item/organ/external/I in Ht.organs) I.take_damage(calculated_damage, 0) // 5 damage min, 26.25 damage max, depending on size & RNG. If they're only stepped on once, the damage will (probably not...) heal over time. Ht.drip(0.1) - add_attack_logs(src,tmob,"Crushed underfoot") + add_attack_logs(src,tmob,"Crushed underfoot (run, about [calculated_damage] damage)") //Walking on I_HURT else @@ -319,7 +319,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 for(var/obj/item/organ/I in Ht.organs) I.take_damage(calculated_damage, 0) Ht.drip(3) - add_attack_logs(src,tmob,"Crushed underfoot") + add_attack_logs(src,tmob,"Crushed underfoot (walk, about [calculated_damage] damage)") //Not a human, or not a taur, generic message only if(!H || !isTaurTail(H.tail_style)) @@ -347,25 +347,25 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 tmob.resting = 1 forceMove(tmob.loc) - //Log it for admins (still a mechanical attack due to the pin) - add_attack_logs(src,tmob,"Pinned (grab w/ shoes) underfoot") - //Not a human, or not a taur while wearing shoes = no grab if(!H || (!isTaurTail(H.tail_style) && H.shoes)) to_chat(src,"You step down onto [tmob], squishing them and forcing them down to the ground!") to_chat(tmob,"[src] steps down and squishes you with their foot, forcing you down to the ground!") + add_attack_logs(src,tmob,"Grabbed underfoot (nontaur, shoes)") //Human, not a taur, but not wearing shoes = yes grab else if(H && (!isTaurTail(H.tail_style) && !H.shoes)) to_chat(src,"You pin [tmob] down onto the floor with your foot and curl your toes up around their body, trapping them inbetween them!") to_chat(tmob,"[src] pins you down to the floor with their foot and curls their toes up around your body, trapping you inbetween them!") equip_to_slot_if_possible(tmob.get_scooped(H), slot_shoes, 0, 1) + add_attack_logs(src,tmob,"Grabbed underfoot (nontaur, no shoes)") //Human, taur, shoes = no grab, special message else if(H.shoes) var/datum/sprite_accessory/tail/taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER(tail.msg_owner_grab_fail)) to_chat(tmob,STEP_TEXT_PREY(tail.msg_prey_grab_fail)) + add_attack_logs(src,tmob,"Grabbed underfoot (taur, shoes)") //Human, taur, no shoes = yes grab, special message else @@ -373,6 +373,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 to_chat(src,STEP_TEXT_OWNER(tail.msg_owner_grab_success)) to_chat(tmob,STEP_TEXT_PREY(tail.msg_prey_grab_success)) equip_to_slot_if_possible(tmob.get_scooped(H), slot_shoes, 0, 1) + add_attack_logs(src,tmob,"Grabbed underfoot (taur, no shoes)") //Return true, the sizediff was enough that we handled it. return TRUE