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

Removes all locate() calls in block() (#25772)

Browse Source 
* Removes all `locate()` calls in `block()`

* Maybe actually push fixes

* Revert bad merge master

* Forgot this one

* Maybe actually push fixes

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-06-28 20:33:38 +00:00
committed by GitHub
parent 02759bcb31
commit efd6f2dfa6
18 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/emergency.dm
+4 -4
View File
@@ -425,13 +425,13 @@
var/list/L2 = list()
switch(destination.dir)
if(NORTH)
L2 = block(locate(destination.x-9, destination.y+36, destination.z), locate(destination.x+9, 255, destination.z))
L2 = block(destination.x-9, destination.y+36, destination.z, destination.x+9, 255, destination.z)
if(SOUTH)
L2 = block(locate(destination.x-9, 1, destination.z), locate(destination.x+9, destination.y-36, destination.z))
L2 = block(destination.x-9, 1, destination.z, destination.x+9, destination.y-36, destination.z)
if(EAST)
L2 = block(locate(destination.x+36, destination.y-9, destination.z), locate(255, destination.y+9, destination.z))
L2 = block(destination.x+36, destination.y-9, destination.z, 255, destination.y+9, destination.z)
if(WEST)
L2 = block(locate(1, destination.y-9, destination.z), locate(destination.x-36, destination.y+9, destination.z))
L2 = block(1, destination.y-9, destination.z, destination.x-36, destination.y+9, destination.z)
create_lance_ripples(L2, destination)
switch(mode)
code/modules/shuttle/lance_docking_targeter.dm
+4 -4
View File
@@ -64,13 +64,13 @@
var/list/L2 = list()
switch(dest_dir)
if(NORTH)
L2 = block(locate(port.x - 9, port.y + 36, port.z), locate(port.x + 9, 255, port.z))
L2 = block(port.x - 9, port.y + 36, port.z, port.x + 9, 255, port.z)
if(SOUTH)
L2 = block(locate(port.x - 9, 1, port.z), locate(port.x + 9, port.y - 36, port.z))
L2 = block(port.x - 9, 1, port.z, port.x + 9, port.y - 36, port.z)
if(EAST)
L2 = block(locate(port.x + 36, port.y - 9, port.z), locate(255, port.y + 9, port.z))
L2 = block(port.x + 36, port.y - 9, port.z, 255, port.y + 9, port.z)
if(WEST)
L2 = block(locate(1, port.y - 9, port.z), locate(port.x - 36, port.y + 9, port.z))
L2 = block(1, port.y - 9, port.z, port.x - 36, port.y + 9, port.z)
for(var/turf/BT in L2)
for(var/obj/Ohno in BT.contents)
if((istype(Ohno, /obj/machinery/atmospherics/supermatter_crystal) || istype(Ohno, /obj/singularity)) && !emagged)
code/modules/shuttle/shuttle.dm
+4 -4
View File
@@ -500,13 +500,13 @@
var/list/L2 = list()
switch(S1.dir)
if(NORTH)
L2 = block(locate(S1.x-9, S1.y+36, S1.z), locate(S1.x+9, 255, S1.z))
L2 = block(S1.x-9, S1.y+36, S1.z, S1.x+9, 255, S1.z)
if(SOUTH)
L2 = block(locate(S1.x-9, 1, S1.z), locate(S1.x+9, S1.y-36, S1.z))
L2 = block(S1.x-9, 1, S1.z, S1.x+9, S1.y-36, S1.z)
if(EAST)
L2 = block(locate(S1.x+36, S1.y-9, S1.z), locate(255, S1.y+9, S1.z))
L2 = block(S1.x+36, S1.y-9, S1.z, 255, S1.y+9, S1.z)
if(WEST)
L2 = block(locate(1, S1.y-9, S1.z), locate(S1.x-36, S1.y+9, S1.z))
L2 = block(1, S1.y-9, S1.z, S1.x-36, S1.y+9, S1.z)
mobile_port.shuttle_smash(L2, S1)
mobile_port.roadkill(L0, L1, S1.dir)