Skip to content
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

fix(mining): assorted fixes #12481

Merged
merged 1 commit into from
May 28, 2024
Merged

fix(mining): assorted fixes #12481

Show file tree
Hide file tree
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
12 changes: 11 additions & 1 deletion code/modules/mapgen/_MapGenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,19 @@
z_level
)

if(locate(/atom/movable) in block(locate(possible_turf.x, possible_turf.y, z_level), locate(possible_turf.x + width, possible_turf.y + height, z_level)))
var/list/block = block(locate(possible_turf.x, possible_turf.y, z_level), locate(possible_turf.x + width, possible_turf.y + height, z_level))
if(!is_only_space_turf_list(block))
continue

return possible_turf

return FALSE

/proc/is_only_space_turf_list(list/L)
for(var/atom/A in L)
if(isspaceturf(A))
continue

return FALSE

return TRUE
2 changes: 1 addition & 1 deletion maps/research-outpost.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
"Lr" = (/obj/structure/reagent_dispensers/watertank,/obj/structure/railing/wood,/turf/simulated/floor/plating,/area/outpost/research/chemistry)
"Lw" = (/obj/structure/window_frame/indestructible/hull,/obj/machinery/door/blast/regular/open{id = "SciOutpShutters"; name = "Window Shutters"},/obj/machinery/door/firedoor/border_only,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/outpost/research/lab)
"LB" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4},/turf/simulated/floor/tiled/white/rough,/area/outpost/research/hallway)
"LC" = (/obj/structure/sign/warning/docking_area,/turf/simulated/wall/r_wall,/area/template_noop)
"LC" = (/obj/structure/sign/warning/docking_area,/turf/simulated/wall/r_wall,/area/outpost/research)
"LD" = (/obj/structure/flora/ausbushes/fullgrass{pixel_x = 31; pixel_y = 6},/obj/structure/flora/ausbushes/sparsegrass{pixel_x = 3; pixel_y = 6},/turf/simulated/floor/natural/grass,/area/outpost/research/hallway)
"LF" = (/obj/machinery/atmospherics/pipe/manifold/visible/yellow{dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/research/isolation_monitoring)
"LJ" = (/obj/structure/window_frame/indestructible/hull,/obj/machinery/door/blast/regular/open{dir = 8; id = "SciOutpShutters"; name = "Window Shutters"},/obj/machinery/door/firedoor/border_only,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/outpost/research/brainstorm)
Expand Down
Loading