mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2025-12-13 09:41:32 +00:00
CitadelRP (#4108)
* dme and dmb * Heeeere we gooo * fasease * Continued. * AAAAAAAAAAAAAAAAAAAAAAAA * Brain going numb * agh * The suffering will be worth it... right? * Going blank... * Am I done? * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * Fixes * Should be everything I care about right now.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
//wrapper
|
||||
/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, local=TRUE, bohsafe=FALSE) //VOREStation Edit
|
||||
/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, local=TRUE, bohsafe=FALSE)
|
||||
new /datum/teleport/instant/science(arglist(args))
|
||||
return
|
||||
|
||||
@@ -184,17 +184,6 @@
|
||||
else
|
||||
teleatom.visible_message(SPAN_DANGER("\The [teleatom] bounces off of the portal!"))
|
||||
return FALSE
|
||||
/* VOREStation Removal
|
||||
if(destination.z in GLOB.using_map.admin_levels) //CentCom z-level
|
||||
if(istype(teleatom, /obj/mecha))
|
||||
var/obj/mecha/MM = teleatom
|
||||
to_chat(MM.occupant, SPAN_DANGER("\The [MM] would not survive the jump to a location so far away!"))
|
||||
return FALSE
|
||||
if(!!length(teleatom.search_contents_for(/obj/item/storage/backpack/holding)))
|
||||
teleatom.visible_message(SPAN_DANGER("\The [teleatom] bounces off of the portal!"))
|
||||
return FALSE
|
||||
*/ //VOREStation Removal End
|
||||
//VOREStation Edit Start
|
||||
var/obstructed = 0
|
||||
var/turf/dest_turf = get_turf(destination)
|
||||
if(local && !(dest_turf.z in GLOB.using_map.player_levels))
|
||||
@@ -219,7 +208,6 @@
|
||||
return FALSE
|
||||
else
|
||||
return TRUE
|
||||
//VOREStation Edit End
|
||||
|
||||
//! ## VR FILE MERGE ## !//
|
||||
|
||||
|
||||
Reference in New Issue
Block a user