Fixes ability to telenom via command teleporter

This commit is contained in:
Heroman
2019-04-08 18:42:29 +10:00
parent 9c4365f700
commit e05deb6566
2 changed files with 25 additions and 11 deletions

View File

@@ -188,9 +188,28 @@
return 0
*/ //VOREStation Removal End
//VOREStation Edit Start
if(!local || (destination.z in using_map.player_levels)) //VOREStation Edit
var/obstructed = 0
var/turf/dest_turf = get_turf(destination)
if(local && !(dest_turf.z in using_map.player_levels))
if(istype(teleatom, /mob/living))
to_chat(teleatom, "<span class='warning'>The portal refuses to carry you that far away!</span>")
return 0
else if(istype(destination.loc, /obj/belly))
var/obj/belly/destination_belly = destination.loc
var/mob/living/telenommer = destination_belly.owner
if(istype(telenommer))
if(!isliving(teleatom))
return 1
else
var/mob/living/telemob = teleatom
if(telemob.can_be_drop_prey && telenommer.can_be_drop_pred)
return 1
obstructed = 1
else if(!isturf(destination.loc) || !destination.x || !destination.y || !destination.z) //If we're inside something or outside universe
obstructed = 1
to_chat(teleatom, "<span class='warning'>Something is blocking way on the other side!</span>")
if(obstructed)
return 0
else
return 1
if(istype(teleatom, /mob/living))
to_chat(teleatom, "<span class='warning'>The portal refuses to carry you that far away!</span>")
return 0
//VOREStation Edit End

View File

@@ -1,12 +1,8 @@
/datum/teleport/proc/try_televore()
//Destination is in a belly
if(isbelly(destination.loc) && isliving(teleatom))
var/mob/living/L = teleatom
if(isbelly(destination.loc))
var/obj/belly/B = destination.loc
if(!L.can_be_drop_prey) //Overloading this as a pref for 'want to be unexpectedly eaten'
return FALSE
teleatom.forceMove(get_turf(B)) //So we can splash the sound and sparks and everything.
playSpecials(destination,effectout,soundout)
teleatom.forceMove(B)
@@ -14,4 +10,3 @@
//No fun!
return FALSE