Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands.

code/game/atoms.dm

@@ -27,6 +27,9 @@
 		if(isobj(src))//Hate typecheckin for a child object but this is just fixing crap another guy broke so if someone wants to put the time in and make this proper feel free.
 			M.take_organ_damage(src:throwforce)
 
+			log_attack("<font color='red'>[hit_atom] ([M.ckey]) was hit by [src] thrown by ([src.fingerprintslast])</font>")
+			log_admin("ATTACK: [hit_atom] ([M.ckey]) was hit by [src] thrown by ([src.fingerprintslast])")
+			msg_admin_attack("ATTACK: [hit_atom] ([M.ckey]) was hit by [src] thrown by ([src.fingerprintslast])")
 
 	else if(isobj(hit_atom))
 		var/obj/O = hit_atom

code/game/hud.dm

@@ -84,12 +84,16 @@
 
 
 //Intent small buttons
+/*
 #define ui_help_small "12:8,1:1"
 #define ui_disarm_small "12:15,1:18"
 #define ui_grab_small "12:32,1:18"
 #define ui_harm_small "12:39,1:1"
-
-
+*/
+#define ui_help_small "13:18,1:-3"
+#define ui_disarm_small "13:18,1:12"
+#define ui_grab_small "14:2,1:12"
+#define ui_harm_small "14:2,1:-3"
 
 //#define ui_swapbutton "6:-16,1:5" //Unused
 
@@ -160,6 +164,12 @@ obj/hud/New(var/type = 0)
 /obj/hud
 	var/obj/screen/action_intent
 	var/obj/screen/move_intent
+
+	var/obj/screen/hurt_intent
+	var/obj/screen/disarm_intent
+	var/obj/screen/help_intent
+	var/obj/screen/grab_intent
+
 	var/hud_shown = 1	//Used for the HUD toggle (F12)
 	var/inventory_shown = 1	//the inventory
 

code/game/machinery/telecomms/broadcaster.dm

@@ -366,7 +366,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 		// --- Filter the message; place it in quotes apply a verb ---
 
-		var/quotedmsg = M.say_quote(message)
+		var/quotedmsg = "\"" + message + "\"" //BS12 EDIT For Arrivals Computer
+		if(job == "Automated Announcement")
+			quotedmsg = message
+		else if(M)
+			quotedmsg = M.say_quote(message)
 
 		// --- This following recording is intended for research and feedback in the use of department radio channels ---
 

code/game/objects/hud.dm

@@ -12,7 +12,7 @@
 	var/list/darkMask = null
 	var/obj/screen/r_hand_hud_object = null
 	var/obj/screen/l_hand_hud_object = null
-	var/show_intent_icons = 0
+	var/show_intent_icons = 1
 	var/list/obj/screen/hotkeybuttons = null
 	var/hotkey_ui_hidden = 0 //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons)
 

code/game/objects/items/weapons/grenades/grenade.dm

@@ -15,6 +15,11 @@
 /obj/item/weapon/grenade/proc/clown_check(var/mob/living/user)
 	if((CLUMSY in user.mutations) && prob(50))
 		user << "<span class='warning'>Huh? How does this thing work?</span>"
+
+		log_attack("<font color='red'>[user.name] ([user.ckey]) clumsily primed \a [src]</font>")
+		log_admin("ATTACK: [user] ([user.ckey]) clumsily primed \a [src]")
+		message_admins("ATTACK: [user] ([user.ckey]) clumsily primed \a [src]")
+
 		active = 1
 		icon_state = initial(icon_state) + "_active"
 		playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
@@ -56,7 +61,12 @@
 /obj/item/weapon/grenade/attack_self(mob/user as mob)
 	if(!active)
 		if(clown_check(user))
-			user << "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>"
+			user << "<span class='warning'>You prime \the [name]! [det_time/10] seconds!</span>"
+
+			log_attack("<font color='red'>[user.name] ([user.ckey]) primed \a [src].</font>")
+			log_admin("ATTACK: [user] ([user.ckey]) primed \a [src].")
+			message_admins("ATTACK: [user] ([user.ckey]) primed \a [src].")
+
 			active = 1
 			icon_state = initial(icon_state) + "_active"
 			add_fingerprint(user)

code/game/verbs/ooc.dm

@@ -1,5 +1,5 @@
 /mob/verb/listen_ooc()
-	set name = "Un/Mute OOC"
+	set name = "Hear/Stop Hearing OOC"
 	set category = "OOC"
 
 	if (src.client)
@@ -44,7 +44,7 @@
 
 	for (var/client/C)
 		if(C.listen_ooc)
-			if (src.client.holder && (!src.client.stealth || (C.holder && C.holder.level > 0)))
+			if (src.client.holder && (!src.client.stealth || (C.holder && C.holder.level != 0)))
 				if (src.client.holder.rank == "Admin Observer")
 					C << "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
 				else if (src.client.holder.rank == "Retired Admin")

code/game/verbs/who.dm

@@ -32,7 +32,7 @@ proc/get_all_admin_clients()
 		else
 			entry += "\t[C.key][C.stealth ? " <i>(as [C.fakekey])</i>" : ""]"
 
-		if(usr.client.holder)
+		if(usr.client.holder && (usr.client.holder.level != 0))
 			var/mob/M = C.mob
 			entry += " - Playing as [M.real_name]"
 			switch(M.stat)