From a4e5bad4098b901bab0594fccf921ebaf831e4fe Mon Sep 17 00:00:00 2001
From: Cael Aislinn <cael_aislinn@yahoo.com.au>
Date: Tue, 29 Oct 2013 05:10:17 +1000
Subject: [PATCH] fixes an overwritten fusion reaction, fixes typo on id
 computer, makes transit tubes traversible, makes conveyor switches access
 protected

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
---
 .../Cael_Aislinn/Rust/fusion_reactions.dm              |  4 ++--
 code/game/machinery/computer/card.dm                   |  2 +-
 code/game/objects/structures/transit_tubes.dm          | 10 ++++++++++
 code/modules/recycling/conveyor2.dm                    |  4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fusion_reactions.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fusion_reactions.dm
index c083cad713..8293e060f4 100644
--- a/code/WorkInProgress/Cael_Aislinn/Rust/fusion_reactions.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Rust/fusion_reactions.dm
@@ -145,14 +145,14 @@ datum/fusion_reaction/pergium_tritium
 	energy_production = 0
 	radiation = 5
 
-datum/fusion_reaction/pergium_deuterium
+datum/fusion_reaction/pergium_obdurium
 	primary_reactant = "Pergium"
 	secondary_reactant = "Obdurium"
 	energy_consumption = 5
 	energy_production = 0
 	radiation = 5
 
-datum/fusion_reaction/pergium_tritium
+datum/fusion_reaction/pergium_solonium
 	primary_reactant = "Pergium"
 	secondary_reactant = "Solonium"
 	energy_consumption = 5
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 8cee9f811c..911ccace95 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -152,7 +152,7 @@
 			carddesc += "<input type='hidden' name='src' value='\ref[src]'>"
 			carddesc += "<input type='hidden' name='choice' value='account'>"
 			carddesc += "<b>Stored account number:</b> <input type='text' id='accountfield' name='account' value='[modify.associated_account_number]' style='width:250px; background-color:white;' onchange='markAccountRed()'>"
-			carddesc += "<input type='submit' value='Rename' onclick='markAccountGreen()'>"
+			carddesc += "<input type='submit' value='Modify' onclick='markAccountGreen()'>"
 			carddesc += "</form>"
 
 			carddesc += "<b>Assignment:</b> "
diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm
index 54630d3c4a..d1435d383d 100644
--- a/code/game/objects/structures/transit_tubes.dm
+++ b/code/game/objects/structures/transit_tubes.dm
@@ -99,6 +99,16 @@ obj/structure/ex_act(severity)
 
 
 
+/obj/structure/transit_tube/Bumped(mob/AM as mob|obj)
+	var/obj/structure/transit_tube/T = locate() in AM.loc
+	if(T)
+		AM << "<span class='warning'>The tube's support pylons block your way.</span>"
+		return ..()
+	else
+		AM.loc = src.loc
+		AM << "<span class='info'>You slip under the tube.</span>"
+
+
 /obj/structure/transit_tube/station/New(loc)
 	..(loc)
 
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 9ba14f5d74..52f37b9dd2 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -211,6 +211,10 @@
 
 // attack with hand, switch position
 /obj/machinery/conveyor_switch/attack_hand(mob/user)
+	if(!allowed(user))
+		user << "<span class='warning'>Access denied.</span>"
+		return
+
 	if(position == 0)
 		if(last_pos < 0)
 			position = 1