diff --git a/baystation12.dme b/baystation12.dme
index f30b5d1f649..a2f6272cdc8 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -863,8 +863,8 @@
 #include "code\modules\admin\admin_attack_log.dm"
 #include "code\modules\admin\admin_investigate.dm"
 #include "code\modules\admin\admin_ranks.dm"
-#include "code\modules\admin\admin_server_greeting.dm"
 #include "code\modules\admin\admin_secrets.dm"
+#include "code\modules\admin\admin_server_greeting.dm"
 #include "code\modules\admin\admin_verbs.dm"
 #include "code\modules\admin\banjob.dm"
 #include "code\modules\admin\create_mob.dm"
@@ -996,7 +996,6 @@
 #include "code\modules\client\preferences_save_migration.dm"
 #include "code\modules\client\preferences_savefile.dm"
 #include "code\modules\client\preferences_spawnpoints.dm"
-#include "code\modules\client\preferences_sql.dm"
 #include "code\modules\client\preferences_system_control.dm"
 #include "code\modules\client\preferences_toggles.dm"
 #include "code\modules\client\ui_style.dm"
@@ -1932,13 +1931,6 @@
 #include "code\modules\wireless\interfaces.dm"
 #include "code\modules\xgm\xgm_gas_data.dm"
 #include "code\modules\xgm\xgm_gas_mixture.dm"
-#include "code\TriDimension\controller.dm"
-#include "code\TriDimension\controller_presets.dm"
-#include "code\TriDimension\Movement.dm"
-#include "code\TriDimension\Pipes.dm"
-#include "code\TriDimension\Structures.dm"
-#include "code\TriDimension\Structures_presets.dm"
-#include "code\TriDimension\Turfs.dm"
 #include "code\unit_tests\equipment_tests.dm"
 #include "code\unit_tests\foundation_tests.dm"
 #include "code\unit_tests\map_tests.dm"
diff --git a/code/__defines/admin.dm b/code/__defines/admin.dm
index 1e64ed8a1b5..bf5b224b2ca 100644
--- a/code/__defines/admin.dm
+++ b/code/__defines/admin.dm
@@ -6,6 +6,7 @@
 #define MUTE_PRAY      0x4
 #define MUTE_ADMINHELP 0x8
 #define MUTE_DEADCHAT  0x10
+#define MUTE_AOOC      0x20
 #define MUTE_ALL       0xFFFF
 
 // Number of identical messages required to get the spam-prevention auto-mute thing to trigger warnings and automutes.
@@ -36,7 +37,7 @@
 #define R_SOUNDS        0x800
 #define R_SPAWN         0x1000
 #define R_MOD           0x2000
-#define R_MENTOR        0x4000
-#define R_HOST          0x8000 //higher than this will overflow
+#define R_DEV           0x4000
+#define R_CCIAA         0x8000 //higher than this will overflow
 
-#define R_MAXPERMISSION 0x8000 // This holds the maximum value for a permission. It is used in iteration, so keep it updated.
\ No newline at end of file
+#define R_MAXPERMISSION 0x8000 // This holds the maximum value for a permission. It is used in iteration, so keep it updated.
diff --git a/code/__defines/damage_organs.dm b/code/__defines/damage_organs.dm
index a82ba2b10c6..b571de4c31a 100644
--- a/code/__defines/damage_organs.dm
+++ b/code/__defines/damage_organs.dm
@@ -19,6 +19,7 @@
 #define STUTTER   "stutter"
 #define EYE_BLUR  "eye_blur"
 #define DROWSY    "drowsy"
+#define INCINERATE "incinerate"
 
 #define FIRE_DAMAGE_MODIFIER 0.0215 // Higher values result in more external fire damage to the skin. (default 0.0215)
 #define  AIR_DAMAGE_MODIFIER 2.025  // More means less damage from hot air scalding lungs, less = more damage. (default 2.025)
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 6d8689b9336..a697f83323a 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -122,3 +122,22 @@
 
 #define ui_spell_master "EAST-1:16,NORTH-1:16"
 #define ui_genetic_master "EAST-1:16,NORTH-3:16"
+
+// AI
+
+#define ui_ai_camera_list "SOUTH:6+1,WEST+1:16"
+#define ui_ai_track_with_camera "SOUTH:6+1,WEST+2:16"
+#define ui_ai_camera_light "SOUTH:6+1,WEST+3:16"
+#define ui_ai_sensor "SOUTH:6+1,WEST+4:16"
+
+#define ui_ai_core "SOUTH:6,WEST+1:16"
+#define ui_ai_crew_monitor "SOUTH:6,WEST+2:16"
+#define ui_ai_crew_manifest "SOUTH:6,WEST+3:16"
+#define ui_ai_alerts "SOUTH:6,WEST+4:16"
+#define ui_ai_announcement "SOUTH:6,WEST+5:16"
+#define ui_ai_shuttle "SOUTH:6,WEST+6:16"
+#define ui_ai_state_laws "SOUTH:6,WEST+7:16"
+#define ui_ai_pda_send "SOUTH:6,WEST+8:16"
+#define ui_ai_pda_log "SOUTH:6,WEST+9:16"
+#define ui_ai_take_picture "SOUTH:6,WEST+10:16"
+#define ui_ai_view_images "SOUTH:6,WEST+11:16"
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index 168471c3c27..1737f0c3ba0 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -137,7 +137,7 @@
 	using.icon_state = "ai_sensor"
 	using.screen_loc = ui_ai_sensor
 	using.layer = 21
-	adding += using
+	adding += using */
 
 	mymob.client.screen += adding + other
 	return
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 55b2246b488..c6350cb2823 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -110,7 +110,6 @@ var/const/NO_EMAG_ACT = -50
 	var/fingerprint_hash = "\[UNSET\]"
 	var/citizenship = "\[UNSET\]"
 	var/religion = "\[UNSET\]"
-	var/age = "\[UNSET\]"
 	var/sex = "\[UNSET\]"
 	var/icon/front
 	var/icon/side
@@ -278,4 +277,3 @@ var/const/NO_EMAG_ACT = -50
 /obj/item/weapon/card/id/all_access/New()
 	access = get_access_ids()
 	..()
-    
\ No newline at end of file
diff --git a/code/modules/admin/admin_secrets.dm b/code/modules/admin/admin_secrets.dm
index 38bebb844a4..0dbc8d5efc7 100644
--- a/code/modules/admin/admin_secrets.dm
+++ b/code/modules/admin/admin_secrets.dm
@@ -42,7 +42,7 @@ var/datum/admin_secrets/admin_secrets = new()
 	var/category = null
 	var/log = 1
 	var/feedback = 1
-	var/permissions = R_HOST
+	var/permissions = R_ADMIN
 	var/warn_before_use = 0
 
 /datum/admin_secret_item/dd_SortValue()
diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm
index e83865c4fb5..352dbbadaae 100644
--- a/code/modules/admin/verbs/bluespacetech.dm
+++ b/code/modules/admin/verbs/bluespacetech.dm
@@ -125,7 +125,7 @@
 	binarycheck()
 		return 1
 
-	suicide()
+/*	suicide()
 		if(key && species.name != "Human")
 			switch(species.name)
 				if("Tajara")
@@ -158,7 +158,7 @@
 					ghost.real_name = "[ghost.key] BSTech"
 					ghost.voice_name = "[ghost.key] BSTech"
 			qdel(src)
-		return
+		return*/
 
 	proc/bsc() //because we all have our unrealistic snowflakes right?
 		if(set_species("Tajara"))
@@ -178,7 +178,7 @@
 		else
 			ghostize(0)
 			key = null
-			suicide()
+			//suicide()
 
 	proc/bsb()
 		if(set_species("Machine"))
@@ -197,7 +197,7 @@
 		else
 			ghostize(0)
 			key = null
-			suicide()
+			//suicide()
 
 	proc/bsd()
 		if(set_species("Diona"))
@@ -215,7 +215,7 @@
 		else
 			ghostize(0)
 			key = null
-			suicide()
+			//suicide()
 
 	proc/bsu()
 		if(set_species("Unathi"))
@@ -234,7 +234,7 @@
 		else
 			ghostize(0)
 			key = null
-			suicide()
+			//suicide()
 
 	proc/bss()
 		if(set_species("Skrell"))
@@ -254,7 +254,7 @@
 		else
 			ghostize(0)
 			key = null
-			suicide()
+		//	suicide()
 
 	say(var/message)
 		var/verb = "says in a subdued tone"
@@ -298,12 +298,12 @@
 		var/client/C = src.client
 		if(C.holder && C.holder.original_mob)
 			if(C.holder.original_mob.key)//Thanks for kicking Tish off the Server Meow, wouldn't have spotted this otherwise.
-				suicide()
+				//suicide()
 				return
 
 			C.holder.original_mob.key = key
 			C.holder.original_mob = null
-		suicide()
+	//	suicide()
 
 //Equipment. All should have canremove set to 0
 //All items with a /bst need the attack_hand() proc overrided to stop people getting overpowered items.