diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 15c68352..7186f977 100644
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -840,6 +840,14 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Cryogenic Storage"
 	icon_state = "Sleep"
 
+/area/crew_quarters/sleep/dorm_one
+	name = "\improper Dorm One"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/dorm_two
+	name = "\improper Dorm Two"
+	icon_state = "Sleep"
+
 /area/crew_quarters/sleep_male
 	name = "\improper Male Dorm"
 	icon_state = "Sleep"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e01a0d08..bcb27d12 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -201,6 +201,10 @@ its easier to just keep the beam vertical.
 	//usr << "[name]: Dn:[density] dir:[dir] cont:[contents] icon:[icon] is:[icon_state] loc:[loc]"
 	return
 
+/atom/proc/set_dir(new_dir)
+	. = new_dir != dir
+	dir = new_dir
+
 /atom/proc/relaymove()
 	return
 
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 8c44a438..e94ce393 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -108,6 +108,9 @@ world/IsBanned(key,address,computer_id)
 
 			var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime], [expires]"
 
+			log_access("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]")
+			message_admins("\blue Failed Login: [key] id:[computer_id] ip:[address] - Banned [.["reason"]]")
+
 			return list("reason"="[bantype]", "desc"="[desc]")
 
 		if (failedcid)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 8f35b32c..45c465d5 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -115,7 +115,7 @@
 	w_class = 3.0 //it is smaller than the pickaxe
 	damtype = "fire"
 	digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
-	origin_tech = "materials=4;phorontech=3;engineering=3"
+	origin_tech = "materials=4;plasmatech=3;engineering=3"
 	desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 	drill_verb = "cutting"
 
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 8b54758e..1ab28ac2 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -111,7 +111,7 @@
 			usr << "You must unfasten the pipe before rotating it."
 			return
 
-		dir = turn(dir, -90)
+		set_dir(turn(dir, -90))
 		update()
 
 	verb/flip()
@@ -125,7 +125,7 @@
 			usr << "You must unfasten the pipe before flipping it."
 			return
 
-		dir = turn(dir, 180)
+		set_dir(turn(dir, 180))
 		switch(ptype)
 			if(2)
 				ptype = 3
@@ -234,14 +234,13 @@
 							user << "There is already a [nicetype] at that location."
 							return
 
-					anchored = 1
+				anchored = 1
 				if(ispipe)
 					level = 1 // We don't want disposal bins to disappear under the floors
 					density = 0
 				else
 					density = 1 // We don't want disposal bins or outlets to go density 0
 				user << "You attach the [nicetype] to the underfloor."
-				anchored = 1
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 			update()
 
@@ -261,7 +260,7 @@
 							var/obj/structure/disposalpipe/P = new pipetype(src.loc)
 							src.transfer_fingerprints_to(P)
 							P.base_icon_state = base_state
-							P.dir = dir
+							P.set_dir(dir)
 							P.dpdir = dpdir
 							P.updateicon()
 
@@ -279,7 +278,7 @@
 
 							var/obj/structure/disposaloutlet/P = new /obj/structure/disposaloutlet(src.loc)
 							src.transfer_fingerprints_to(P)
-							P.dir = dir
+							P.set_dir(dir)
 							var/obj/structure/disposalpipe/trunk/Trunk = CP
 							Trunk.linked = P
 
@@ -287,7 +286,7 @@
 
 							var/obj/machinery/disposal/deliveryChute/P = new /obj/machinery/disposal/deliveryChute(src.loc)
 							src.transfer_fingerprints_to(P)
-							P.dir = dir
+							P.set_dir(dir)
 
 						del(src)
 						return
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 8e0bb67d..481dc879 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -550,7 +550,7 @@
 
 		loc = D.trunk
 		active = 1
-		dir = DOWN
+		set_dir(DOWN)
 		spawn(1)
 			move()		// spawn off the movement process
 
@@ -709,7 +709,7 @@
 	//
 	proc/transfer(var/obj/structure/disposalholder/H)
 		var/nextdir = nextdir(H.dir)
-		H.dir = nextdir
+		H.set_dir(nextdir)
 		var/turf/T = H.nextloc()
 		var/obj/structure/disposalpipe/P = H.findpipe(T)
 
@@ -747,6 +747,7 @@
 			icon_state = "[base_icon_state]f"
 		else
 			icon_state = base_icon_state*/
+		icon_state = base_icon_state
 		return
 
 
@@ -815,7 +816,7 @@
 			for(var/D in cardinal)
 				if(D & dpdir)
 					var/obj/structure/disposalpipe/broken/P = new(src.loc)
-					P.dir = D
+					P.set_dir(D)
 
 		src.invisibility = 101	// make invisible (since we won't delete the pipe immediately)
 		var/obj/structure/disposalholder/H = locate() in src
@@ -926,7 +927,7 @@
 			if("pipe-tagger-partial")
 				C.ptype = 14
 		src.transfer_fingerprints_to(C)
-		C.dir = dir
+		C.set_dir(dir)
 		C.density = 0
 		C.anchored = 1
 		C.update()
@@ -972,7 +973,7 @@
 
 	transfer(var/obj/structure/disposalholder/H)
 		var/nextdir = nextdir(H.dir)
-		H.dir = nextdir
+		H.set_dir(nextdir)
 
 		var/turf/T
 		var/obj/structure/disposalpipe/P
@@ -1233,7 +1234,7 @@
 
 	transfer(var/obj/structure/disposalholder/H)
 		var/nextdir = nextdir(H.dir, H.destinationTag)
-		H.dir = nextdir
+		H.set_dir(nextdir)
 		var/turf/T = H.nextloc()
 		var/obj/structure/disposalpipe/P = H.findpipe(T)
 
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 21b91a76..61abc757 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 01f79a9d..806aa5e5 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/nano/css/shared.css b/nano/css/shared.css
index 91caff7c..3d40fb4f 100644
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -73,6 +73,15 @@ a.white:hover {
     display: none;
 }
 
+.linkDanger, a.linkDanger:link, a.linkDanger:visited, a.linkDanger:active {
+    color: #ffffff;
+    background-color: #ff0000;
+    border-color: #aa0000;
+}
+.linkDanger:hover {
+    background-color: #ff6666;
+}
+
 .linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn:hover, .selected, a.selected:link, a.selected:visited, a.selected:active, a.selected:hover {
     color: #ffffff;
     background: #2f943c;
diff --git a/nano/templates/accounts_terminal.tmpl b/nano/templates/accounts_terminal.tmpl
index 9903878e..e70561c9 100644
--- a/nano/templates/accounts_terminal.tmpl
+++ b/nano/templates/accounts_terminal.tmpl
@@ -3,7 +3,7 @@
     <b>Machine</b>:
   </div>
   <div class="itemContent">
-    <span class="average">{{:machine_id}}</span>
+    <span class="average">{{:data.machine_id}}</span>
   </div>
 </div>
 <div class="item">
@@ -11,25 +11,25 @@
     <b>ID</b>:
   </div>
   <div class="itemContent">
-    {{:~link(id_card, 'eject', {'choice' : "insert_card"}, null, id_inserted ? 'fixedLeftWidest' : 'fixedLeft')}}
+    {{:helper.link(data.id_card, 'eject', {'choice' : "insert_card"}, null, data.id_inserted ? 'fixedLeftWidest' : 'fixedLeft')}}
   </div>
 </div>
 
-{{if access_level > 0}}
+{{if data.access_level > 0}}
   <div class='item'>
     <h2>Menu</h2>
   </div>
-  {{:~link('Home', 'home', {'choice' : 'view_accounts_list'}, !creating_new_account && !detailed_account_view ? 'disabled' : null, 'fixedLeft')}}
-  {{:~link('New Account', 'gear', {'choice' : 'create_account'}, creating_new_account ? 'disabled' : null, 'fixedLeft')}}
-  {{:~link('Print', 'print', {'choice' : 'print'}, creating_new_account ? 'disabled' : null, 'fixedLeft')}}
+  {{:helper.link('Home', 'home', {'choice' : 'view_accounts_list'}, !data.creating_new_account && !data.detailed_account_view ? 'disabled' : null, 'fixedLeft')}}
+  {{:helper.link('New Account', 'gear', {'choice' : 'create_account'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}}
+  {{:helper.link('Print', 'print', {'choice' : 'print'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}}
 
-  {{if creating_new_account}}
+  {{if data.creating_new_account}}
     <div class='item'>
       <h2>Create Account</h2>
     </div>
 
-    <form name='create_account' action='?src={{:src}}' method='get'>
-      <input type='hidden' name='src' value='{{:src}}'>
+    <form name='create_account' action='?src={{:data.src}}' method='get'>
+      <input type='hidden' name='src' value='{{:data.src}}'>
       <input type='hidden' name='choice' value='finalise_create_account'>
       <div class='item'>
         <div class='itemLabel'>
@@ -52,7 +52,7 @@
       </div>
     </form>
   {{else}}
-    {{if detailed_account_view}}
+    {{if data.detailed_account_view}}
       <div class='item'>
         <h2>Account Details</h2>
       </div>
@@ -62,7 +62,7 @@
           <span class='average'><b>Account Number</b>:</span>
         </div>
         <div class="itemContent">
-          #{{:account_number}}
+          #{{:data.account_number}}
         </div>
       </div>
 
@@ -71,7 +71,7 @@
           <span class='average'><b>Holder</b>:</span>
         </div>
         <div class="itemContent">
-          {{:owner_name}}
+          {{:data.owner_name}}
         </div>
       </div>
 
@@ -80,7 +80,7 @@
           <span class='average'><b>Balance</b>:</span>
         </div>
         <div class="itemContent">
-          ${{:~formatNumber(money)}}
+          ${{:helper.formatNumber(data.money)}}
         </div>
       </div>
 
@@ -89,17 +89,17 @@
           <span class='average'><b>Status</b>:</span>
         </div>
         <div class="itemContent">
-          <span class='{{: suspended ? "bad" : "good"}}'>
-            {{: suspended ? "Suspended" : "Active"}}
+          <span class='{{:data.suspended ? "bad" : "good"}}'>
+            {{:data.suspended ? "Suspended" : "Active"}}
           </span>
         </div>
       </div>
       <div class='item'>
-        {{:~link(suspended ? "Unsuspend" : "Suspend", 'gear', {'choice' : 'toggle_suspension'})}}
+        {{:helper.link(data.suspended ? "Unsuspend" : "Suspend", 'gear', {'choice' : 'toggle_suspension'})}}
       </div>
 
       <div class="statusDisplay" style="overflow: auto;">
-        {{if transactions}}
+        {{if data.transactions}}
         <table style='width: 100%'>
           <thead>
             <tr>
@@ -111,13 +111,13 @@
             </th>
           </thead>
           <tbody>
-              {{for transactions}}
+              {{for data.transactions}}
                 <tr>
-                    <td>{{:date}} {{:time}}</td>
-                    <td>{{:target_name}}</td>
-                    <td>{{:purpose}}</td>
-                    <td>{{:amount}}</td>
-                    <td>{{:source_terminal}}</td>
+                    <td>{{:value.date}} {{:value.time}}</td>
+                    <td>{{:value.target_name}}</td>
+                    <td>{{:value.purpose}}</td>
+                    <td>{{:value.amount}}</td>
+                    <td>{{:value.source_terminal}}</td>
                 </tr>
               {{/for}}
           </tbody>
@@ -126,7 +126,6 @@
           <span class='alert'>This account has no financial transactions on record for today.</span>
         {{/if}}
       </div>
-
         <div class='item'>
           <h2>CentCom Administrator</h2>
         </div>
@@ -134,15 +133,15 @@
           <div class='fixedLeft'>
             Payroll:
           </div>
-          {{:~link('Revoke', 'transferthick-e-w', {'choice' : 'revoke_payroll'}, account_number == station_account_number ? 'disabled' : null, 'linkDanger')}}
+          {{:helper.link('Revoke', 'transferthick-e-w', {'choice' : 'revoke_payroll'}, data.account_number == data.station_account_number ? 'disabled' : null, 'linkDanger')}}
         </div>
-        {{if access_level >= 2}}
+        {{if data.access_level >= 2}}
         <div class='item'>
           <div class='fixedLeft'>
             Silent Fund Adjustment:
           </div>
-          {{:~link('Add', 'plus', {'choice' : 'add_funds'})}}
-          {{:~link('Remove', 'minus', {'choice' : 'remove_funds'})}}
+          {{:helper.link('Add', 'plus', {'choice' : 'add_funds'})}}
+          {{:helper.link('Remove', 'minus', {'choice' : 'remove_funds'})}}
         </div>
         {{/if}}
     {{else}}
@@ -150,13 +149,13 @@
       <div class='item'>
         <h2>NanoTrasen Accounts</h2>
       </div>
-      {{if accounts}}
+      {{if data.accounts}}
         <table style="width: 100%">
-          {{for accounts}}
-            <tr class='{{: suspended ? "bad" : ""}}'>
-              <td><b>{{:~link('#' + account_number, '', {'choice' : 'view_account_detail', 'account_index' : account_index})}}</b></td>
-              <td>{{:owner_name}}</td>
-              <td>{{:suspended}}</td>
+          {{for data.accounts}}
+            <tr class='{{:value.suspended ? "bad" : ""}}'>
+              <td><b>{{:helper.link('#' + value.account_number, '', {'choice' : 'view_account_detail', 'account_index' : value.account_index})}}</b></td>
+              <td>{{:value.owner_name}}</td>
+              <td>{{:value.suspended}}</td>
             </tr>
           {{/for}}
         </table>