Skip to content

Fix elevator spawning lights on each floors #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PsyCommando merged 1 commit into from
Jan 25, 2023
Merged

Fix elevator spawning lights on each floors #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions code/modules/turbolift/turbolift_map.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,19 +208,6 @@
panel_ext.set_dir(udir)
cfloor.ext_panel = panel_ext

// Place lights
if(light_type)
var/turf/placing1 = locate(light_x1, light_y1, cz)
var/turf/placing2 = locate(light_x2, light_y2, cz)
var/obj/machinery/light/light1 = new light_type(placing1, light)
var/obj/machinery/light/light2 = new light_type(placing2, light)
if(udir == NORTH || udir == SOUTH)
light1.set_dir(WEST)
light2.set_dir(EAST)
else
light1.set_dir(SOUTH)
light2.set_dir(NORTH)

// Update area.
if(az > areas_to_use.len)
log_debug("Insufficient defined areas in turbolift datum, aborting.")
Expand All @@ -234,6 +221,19 @@
lift.control_panel_interior.set_dir(udir)
lift.current_floor = lift.floors[1]

// Place interior lights
if(light_type)
var/turf/placing1 = locate(light_x1, light_y1, uz)
var/turf/placing2 = locate(light_x2, light_y2, uz)
var/obj/machinery/light/light1 = new light_type(placing1, light)
var/obj/machinery/light/light2 = new light_type(placing2, light)
if(udir == NORTH || udir == SOUTH)
light1.set_dir(WEST)
light2.set_dir(EAST)
else
light1.set_dir(SOUTH)
light2.set_dir(NORTH)

lift.open_doors()

qdel(src) // We're done.