Committed for Sieve:

Reverted dismemberment
- This is the majority of the files

Reverted the gun change
- You wont shoot yourself putting your gun away
- You don't have to fire off all of your shots before hitting someone with your gun

Reverted Tarajans
- As requested

Hotfix for the Holodeck.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3574 316c924e-a436-60f5-8080-3fe189b3f50e

code/datums/configuration.dm

@@ -34,7 +34,6 @@
 	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
 	var/Ticklag = 0.9
 	var/Tickcomp = 0
-	var/no_taj = 0
 
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
@@ -306,9 +305,6 @@
 				if("tickcomp")
 					Tickcomp = 1
 
-				if("no_taj")
-					no_taj = 1
-
 				else
 					diary << "Unknown setting in configuration: '[name]'"