cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

-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.

Browse Source 
-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
This commit is contained in:
giacomand@gmail.com
2012-09-03 15:55:06 +00:00
parent 9a78262c34
commit 754bcf6e72
4 changed files with 2480 additions and 2468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/machinery/camera/wires.dm
View File

@@ -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")

9
code/game/turfs/turf.dm
View File

@@ -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.y = TRANSITIONEDGE + 1
A.x = rand(TRANSITIONEDGE + 2, world.maxx - TRANSITIONEDGE - 2)
spawn (0)
if ((A && A.loc))