cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed and improved object mind transfer. It will work properly now.

Browse Source 
Fixed teleporting randomly on clown planet z level (with hand tele). Probably won't work on extended but who cares.
Some misc improvements to code words.
Cut down on the amount of chloralhydrate in the sleepypen since it was fatal, apparently.
Fixed observing. Entry shuttle starts with less sleepers than before.
Some more wip stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1670 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2011-06-08 04:12:05 +00:00
parent 16ee275602
commit bbd3be907a
9 changed files with 7452 additions and 7361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/teleportation.dm
+3 -1
View File
@@ -116,7 +116,9 @@ Frequency:
if(T.x>world.maxx-4 || T.x<4) continue //putting them at the edge is dumb
if(T.y>world.maxy-4 || T.y<4) continue
turfs += T
if(turfs) L["None (Dangerous)"] = pick(turfs)
var/turf/current_location = locate(user.x,user.y,user.z)//Can't teleport randomly on clown-planet z-level.
if(turfs&&current_location.z!=6)//Which is z level 6.
L["None (Dangerous)"] = pick(turfs)
var/t1 = input(user, "Please select a teleporter to lock in on.", "Hand Teleporter") in L
if ((user.equipped() != src || user.stat || user.restrained()))
return