shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update talisman.dm

Browse Source
This commit is contained in:
LetterJay
2017-12-30 13:32:02 -06:00
committed by GitHub
parent a8d6fa7fd7
commit a160997587
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/gamemodes/cult/talisman.dm
View File

@@ -65,13 +65,8 @@
log_game("Teleport talisman failed - no other teleport runes")
return ..(user, 0)
<<<<<<< HEAD
if(user.z > ZLEVEL_SPACEMAX)
to_chat(user, "<span class='cultitalic'>You are not in the right dimension!</span>")
=======
if(is_away_level(user.z))
to_chat(user, "<span class='cult italic'>You are not in the right dimension!</span>")
>>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
log_game("Teleport talisman failed - user in away mission")
return ..(user, 0)