From afd33125ab82732021113edc52fbcd7a12d7c65f Mon Sep 17 00:00:00 2001
From: Erthilo <erthilo@gmail.com>
Date: Sat, 5 May 2012 21:34:34 +0100
Subject: [PATCH] TG: - hand tools now fit on your belt slot - added feedback
 logging for newscasters - added feedback logging for admin verbs - added
 shuttle timers to escape pods - added feedback logging to chemical reactions
 - clipboard can now fit on your belt Revision: r3465 Author: 	 baloh.matevz

---
 code/defines/obj/weapon.dm               |  2 +-
 code/game/machinery/newscaster.dm        |  4 ++--
 code/game/objects/items/weapons/tools.dm |  6 +++---
 code/modules/admin/admin.dm              | 12 ++++++------
 code/modules/admin/admin_verbs.dm        |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 0803841d5ef..5719f6a6d76 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -639,7 +639,7 @@
 	w_class = 2.0
 	throw_speed = 3
 	throw_range = 10
-	flags = ONBELT
+	flags = FPRINT | TABLEPASS | ONBELT
 
 /obj/item/weapon/clipboard/notebook
 	name = "notebook"
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index dd9176d0476..cc9f98ef659 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -615,11 +615,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
 			if( istype(I, /obj/item/device/pda) )
 				var/obj/item/device/pda/P = I
 				if(P.id)
-					src.scanned_user = "[P.id.registered] ([P.id.assignment])"
+					src.scanned_user = "[P.id.registered_name] ([P.id.assignment])"
 					src.screen=2
 			else
 				var/obj/item/weapon/card/id/T = I
-				src.scanned_user = text("[T.registered] ([T.assignment])")
+				src.scanned_user = text("[T.registered_name] ([T.assignment])")
 				src.screen=2*/  //Obsolete after autorecognition
 
 	if (src.isbroken)
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 997ca128d7f..ba6fd257718 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -13,7 +13,7 @@ WELDINGTOOOL
 	desc = "A wrench with common uses. Can be found in your hand."
 	icon = 'items.dmi'
 	icon_state = "wrench"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
@@ -44,7 +44,7 @@ WELDINGTOOOL
 	name = "Welding Tool"
 	icon = 'items.dmi'
 	icon_state = "welder"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -310,7 +310,7 @@ WELDINGTOOOL
 	desc = "This cuts wires."
 	icon = 'items.dmi'
 	icon_state = "cutters"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 6.0
 	throw_speed = 2
 	throw_range = 9
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5897f2cded8..117f80d7b2d 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -522,8 +522,8 @@ var/global/BSACooldown = 0
 					for(var/job in notbannedlist)
 						ban_unban_log_save("[key_name(usr)] jobbanned [key_name(M)] from [job]. reason: [reason]")
 						log_admin("[key_name(usr)] banned [key_name(M)] from [job]")
-						feedback_inc("ban_job",1)
-						feedback_add_details("ban_job","- [job]")
+						//feedback_inc("ban_job",1)
+						//feedback_add_details("ban_job","- [job]")
 						jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]")
 						if(!msg)	msg = job
 						else		msg += ", [job]"
@@ -547,8 +547,8 @@ var/global/BSACooldown = 0
 						if("Yes")
 							ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]")
 							log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]")
-							feedback_inc("ban_job_unban",1)
-							feedback_add_details("ban_job_unban","- [job]")
+							//feedback_inc("ban_job_unban",1)
+							//feedback_add_details("ban_job_unban","- [job]")
 							jobban_unban(M, job)
 							if(!msg)	msg = job
 							else		msg += ", [job]"
@@ -1615,8 +1615,8 @@ var/global/BSACooldown = 0
 					ok = 1*/
 				if("toxic")
 				/*
-					feedback_inc("admin_secrets_fun_used",1)
-					feedback_add_details("admin_secrets_fun_used","T")
+					//feedback_inc("admin_secrets_fun_used",1)
+					//feedback_add_details("admin_secrets_fun_used","T")
 					for(var/obj/machinery/atmoalter/siphs/fullairsiphon/O in world)
 						O.t_status = 3
 					for(var/obj/machinery/atmoalter/siphs/scrubbers/O in world)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index ef769c34c8e..f7fe7379972 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -625,7 +625,7 @@
 		log_admin("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
 		ban_unban_log_save("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
 		message_admins("\blue [ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
-		feedback_inc("ban_warn",1)
+		//feedback_inc("ban_warn",1)
 
 		del(M.client)
 //	feedback_add_details("admin_verb","WARN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!