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

Refactor reactive armour teleport proc (#17490)

Browse Source 
* Add zlevel teleport check to reactive armour

* Refactor to use do_teleport

* spaces

* bag of holding causes unsafe teleport

* keep same range for RD armor BoH teleport

* fix

* extra comment, style

* Update code/datums/helper_datums/teleport.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/datums/helper_datums/teleport.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
datlo
2022-03-21 14:23:10 +00:00
committed by GitHub
co-authored by AffectedArc07
parent 4644f6968a
commit 8199f5d1b2
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/teleport.dm
+20 -7
View File
@@ -1,5 +1,5 @@
//wrapper
/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, bypass_area_flag=FALSE)
/proc/do_teleport(ateleatom, adestination, aprecision = 0, afteleport = 1, aeffectin = null, aeffectout = null, asoundin = null, asoundout = null, bypass_area_flag = FALSE, safe_turf_pick = FALSE)
var/datum/teleport/instant/science/D = new
if(D.start(arglist(args)))
return 1
@@ -15,18 +15,19 @@
var/soundout //soundfile to play after teleportation
var/force_teleport = 1 //if false, teleport will use Move() proc (dense objects will prevent teleportation)
var/ignore_area_flag = FALSE
var/safe_turf_first = FALSE //If the teleport isn't precise and this is TRUE, only non-space, non-dense turfs will be selected, unless there's no other option for teleportation.
/datum/teleport/proc/start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, bypass_area_flag=FALSE)
/datum/teleport/proc/start(ateleatom, adestination, aprecision = 0, afteleport = 1, aeffectin = null, aeffectout = null, asoundin = null, asoundout = null, bypass_area_flag = FALSE, safe_turf_pick = FALSE)
if(!initTeleport(arglist(args)))
return 0
return 1
/datum/teleport/proc/initTeleport(ateleatom, adestination, aprecision, afteleport, aeffectin, aeffectout, asoundin, asoundout, bypass_area_flag=FALSE)
/datum/teleport/proc/initTeleport(ateleatom, adestination, aprecision, afteleport, aeffectin, aeffectout, asoundin, asoundout, bypass_area_flag = FALSE, safe_turf_pick = FALSE)
if(!setTeleatom(ateleatom))
return 0
if(!setDestination(adestination))
return 0
safe_turf_first = safe_turf_pick //before precision for bag of holding interference
if(!setPrecision(aprecision))
return 0
setEffects(aeffectin,aeffectout)
@@ -104,8 +105,16 @@
var/center = get_turf(destination)
if(!center)
center = destination
for(var/turf/T in range(precision,center))
posturfs.Add(T)
if(safe_turf_first)
for(var/turf/T in range(precision, center))
if(istype(T, /turf/space))
continue
if(T.density)
continue
posturfs.Add(T)
if(!length(posturfs)) //This is either an unsafe teleport or we didnt find a single safe turf for a safe teleport
for(var/turf/T in range(precision, center))
posturfs.Add(T)
destturf = safepick(posturfs)
else
destturf = get_turf(destination)
@@ -177,7 +186,11 @@
var/list/bagholding = teleatom.search_contents_for(/obj/item/storage/backpack/holding)
if(bagholding.len)
precision = max(rand(1, 100)*bagholding.len, 100)
if(safe_turf_first) //If this is true, this is already a random teleport. Make it unsafe but do not touch the precision.
safe_turf_first = FALSE
else
precision = max(rand(1, 100) * length(bagholding), 100)
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
to_chat(MM, "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>")