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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-21 23:27:23 +02:00
parent eed189b175 467bda7c4d
commit 7fef96e38d
42 changed files with 1002 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/scrolls.dm
+5 -1
View File
@@ -47,7 +47,11 @@
var/A
A = input(user, "Area to jump to", "BOOYEA", A) in teleportlocs
A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs
if(!A)
return
var/area/thearea = teleportlocs[A]
if(user.stat || user.restrained())