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

hierophant staff / blue / red cube no longer ignore teleport blocks (#18868)

Browse Source
This commit is contained in:
Qwertytoforty
2022-08-21 09:31:16 +01:00
committed by GitHub
parent 400e9f8c65
commit d6e24aa850
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/unsorted.dm
+2
View File
@@ -148,6 +148,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
return FALSE
if(A.tele_proof)
return TRUE
if(!is_teleport_allowed(O.z))
return TRUE
else
return FALSE
code/modules/mining/lavaland/loot/hierophant_loot.dm
+3
View File
@@ -159,6 +159,9 @@
if(get_dist(user, beacon) <= 2) //beacon too close abort
to_chat(user, "<span class='warning'>You are too close to the beacon to teleport to it!</span>")
return
if(is_in_teleport_proof_area(beacon))
to_chat(user, "<span class='warning'>[src] sparks and fizzles.</span>")
return
if(is_blocked_turf(get_turf(beacon), TRUE))
to_chat(user, "<span class='warning'>The beacon is blocked by something, preventing teleportation!</span>")
return