-Tweaked space travelling between Z levels to be more random. When travelling between Z levels, your X or Y axis is changed to be on the other side of the map. I made it so that the axis that didn't change will be random. This will eventually stop items and mobs being stuck in an infinite loop, as the only choice to get out of it was to pray or admin help or just to give up and ghost.

-Players can now tell if an camera alarm has gone off by looking at the wire interface.
-Changed a chair in the Cyborg Station, it's now an office chair.

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

code/game/machinery/camera/wires.dm

@@ -125,6 +125,7 @@
 	t1 += "<br>\n[(src.view_range == initial(view_range) ? "The focus light is on." : "The focus light is off.")]"
 	t1 += "<br>\n[(src.can_use() ? "The power link light is on." : "The power link light is off.")]"
 	t1 += "<br>\n[(light_disabled ? "The camera light is off." : "The camera light is on.")]"
+	t1 += "<br>\n[(alarm_on ? "The alarm light is on." : "The alarm light is off.")]"
 
 	t1 += "<p><a href='?src=\ref[src];close2=1'>Close</a></p>\n"
 	user << browse(t1, "window=wires")

code/game/turfs/turf.dm

@@ -1739,15 +1739,22 @@ turf/simulated/floor/proc/update_icon()
 
 			if(src.x <= TRANSITIONEDGE)
 				A.x = world.maxx - TRANSITIONEDGE - 2
+				A.y = rand(TRANSITIONEDGE + 2, world.maxy - TRANSITIONEDGE - 2)
 
 			else if (A.x >= (world.maxx - TRANSITIONEDGE - 1))
 				A.x = TRANSITIONEDGE + 1
+				A.y = rand(TRANSITIONEDGE + 2, world.maxy - TRANSITIONEDGE - 2)
 
 			else if (src.y <= TRANSITIONEDGE)
 				A.y = world.maxy - TRANSITIONEDGE -2
+				A.x = rand(TRANSITIONEDGE + 2, world.maxx - TRANSITIONEDGE - 2)
 
 			else if (A.y >= (world.maxy - TRANSITIONEDGE - 1))
 				A.y = TRANSITIONEDGE + 1
+				A.x = rand(TRANSITIONEDGE + 2, world.maxx - TRANSITIONEDGE - 2)
+
+
+
 
 			spawn (0)
 				if ((A && A.loc))

html/changelog.html

@@ -58,6 +58,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 		<li class="rscadd">Cameras aren't all X-ray anymore. The AI won't be able to see what room you are in if there's no normal camera inside that room or if there's no X-ray camera nearby..</li>
 		<li class="rscadd">Cameras get upgrades! Currently there's X-ray, EMP-Proof and Motion. You'll find the EMP-Proof and Motion cameras in the normal places (Singularity Pen & EVA), the new X-ray cameras can be found in the Dormitory and Bathrooms, plus some extra ones to invade your privacy. See if you can smash them all.</li>
 		<li class="tweak">Alien Larva can bite simple animals (see: Ian, Runtime, Mice) to kill them and gain a small amount of growing points.</li>
+		<li class="tweak">Space travel was tweaked to be more random when changing Z levels. This will stop people and items from being stuck in an infinite loop, as they will eventually hit something to make them stop.</li>
 	</ul>
 </div>