cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed elevator button being borked

Browse Source
This commit is contained in:
Heroman
2019-03-03 18:16:02 +10:00
parent 5f4d6c754b
commit 87f89f2728
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/turbolift/turbolift_map.dm
+26 -26
View File
@@ -36,7 +36,7 @@
// These modifiers are used in relation to the origin
// to place the system control panels and doors.
var/make_walls = isnull(wall_type) ? FALSE : TRUE
var/make_walls = isnull(wall_type) ? FALSE : TRUE //VOREStation addition: Wall-less elevator
var/int_panel_x
var/int_panel_y
var/ext_panel_x
@@ -60,70 +60,70 @@
if(NORTH)
int_panel_x = ux + FLOOR(lift_size_x/2, 1)
int_panel_y = uy + 1
int_panel_y = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
ext_panel_x = ux
ext_panel_y = ey + 2
door_x1 = ux + 1
door_y1 = ey + (make_walls ? 0 : 1)
door_y1 = ey + (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator
door_x2 = ex - 1
door_y2 = ey + 1
light_x1 = ux + (make_walls ? 1 : 0)
light_y1 = uy + (make_walls ? 1 : 0)
light_x2 = ux + lift_size_x - (make_walls ? 1 : 0)
light_y2 = uy + (make_walls ? 1 : 0)
light_x1 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y1 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y2 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
if(SOUTH)
int_panel_x = ux + FLOOR(lift_size_x/2, 1)
int_panel_y = ey - 1
int_panel_y = ey - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
ext_panel_x = ex
ext_panel_y = uy - 2
door_x1 = ux + 1
door_y1 = uy - 1
door_x2 = ex - 1
door_y2 = uy - (make_walls ? 0 : 1)
door_y2 = uy - (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator
light_x1 = ux + (make_walls ? 1 : 0)
light_y1 = uy + (make_walls ? 2 : 1)
light_x2 = ux + lift_size_x - (make_walls ? 1 : 0)
light_y2 = uy + lift_size_y - (make_walls ? 1 : 0)
light_x1 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y1 = uy + (make_walls ? 2 : 1) //VOREStation edit: Wall-less elevator
light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y2 = uy + lift_size_y - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
if(EAST)
int_panel_x = ux+1
int_panel_x = ux+(make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
int_panel_y = uy + FLOOR(lift_size_y/2, 1)
ext_panel_x = ex+2
ext_panel_y = ey
door_x1 = ex + (make_walls ? 0 : 1)
door_x1 = ex + (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator
door_y1 = uy + 1
door_x2 = ex + 1
door_y2 = ey - 1
light_x1 = ux + (make_walls ? 1 : 0)
light_y1 = uy + (make_walls ? 1 : 0)
light_x2 = ux + (make_walls ? 1 : 0)
light_y2 = uy + lift_size_x - (make_walls ? 1 : 0)
light_x1 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y1 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_x2 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y2 = uy + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
if(WEST)
int_panel_x = ex-1
int_panel_x = ex-(make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
int_panel_y = uy + FLOOR(lift_size_y/2, 1)
ext_panel_x = ux-2
ext_panel_y = uy
door_x1 = ux - 1
door_y1 = uy + 1
door_x2 = ux - (make_walls ? 0 : 1)
door_x2 = ux - (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator
door_y2 = ey - 1
light_x1 = ux + lift_size_x - (make_walls ? 1 : 0)
light_y1 = uy + (make_walls ? 1 : 0)
light_x2 = ux + lift_size_x - (make_walls ? 1 : 0)
light_y2 = uy + lift_size_y - (make_walls ? 1 : 0)
light_x1 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y1 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
light_y2 = uy + lift_size_y - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator
// Generate each floor and store it in the controller datum.
for(var/cz = uz;cz<=ez;cz++)
@@ -146,7 +146,7 @@
// Update path appropriately if needed.
var/swap_to = /turf/simulated/open
if(cz == uz) // Elevator.
if(wall_type && (tx == ux || ty == uy || tx == ex || ty == ey) && !(tx >= door_x1 && tx <= door_x2 && ty >= door_y1 && ty <= door_y2))
if(wall_type && (tx == ux || ty == uy || tx == ex || ty == ey) && !(tx >= door_x1 && tx <= door_x2 && ty >= door_y1 && ty <= door_y2)) //VOREStation edit: Wall-less elevator
swap_to = wall_type
else
swap_to = floor_type