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.

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

Landing fixes #2944

Merged
merged 5 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions maps/sierra/z1-z5_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -93229,7 +93229,6 @@
},
/obj/floor_decal/techfloor,
/obj/floor_decal/industrial/hatch/yellow,
/obj/shuttle_landmark/reaper/dock,
/turf/simulated/floor/tiled/techfloor/grid,
/area/crew_quarters/docking)
"nMh" = (
Expand Down Expand Up @@ -94523,6 +94522,7 @@
/area/engineering/engine_room)
"nYR" = (
/obj/shuttle_landmark/merc/dock,
/obj/shuttle_landmark/reaper/dock,
/turf/space,
/area/space)
"nYS" = (
Expand Down Expand Up @@ -163647,6 +163647,10 @@
},
/turf/simulated/floor/grass/cut,
/area/crew_quarters/garden_room)
"yfe" = (
/obj/shuttle_landmark/snz/dock,
/turf/space,
/area/space)
"yfi" = (
/obj/structure/cable/green{
d1 = 4;
Expand Down Expand Up @@ -180105,7 +180109,7 @@ wJN
wJN
wJN
wJN
wJN
yfe
wJN
wJN
wJN
Expand Down
1 change: 0 additions & 1 deletion mods/_maps/farfleet/code/farfleet_shuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
landmark_tag = "nav_hangar_snz"
base_area = /area/ship/farfleet/command/snz_hangar
base_turf = /turf/simulated/floor/plating
movable_flags = MOVABLE_FLAG_EFFECTMOVE

/obj/shuttle_landmark/snz/altdock
name = "Docking Port"
Expand Down
7 changes: 2 additions & 5 deletions mods/_maps/farfleet/maps/farfleet-2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3950,10 +3950,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/ship/farfleet/crew/hydroponics)
"Ms" = (
/obj/shuttle_landmark/snz/start,
/turf/simulated/floor/tiled/monotile,
/area/ship/farfleet/command/snz_hangar)
"Mt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
Expand Down Expand Up @@ -4352,6 +4348,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/shuttle_landmark/snz/start,
/turf/simulated/floor/tiled/steel_grid,
/area/ship/snz)
"Rs" = (
Expand Down Expand Up @@ -14660,7 +14657,7 @@ Uu
Uu
wJ
ME
Ms
ns
aW
Iu
eB
Expand Down
1 change: 0 additions & 1 deletion mods/_maps/sentinel/code/sentinel_shuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
landmark_tag = "nav_hangar_reaper"
base_area = /area/ship/patrol/command/hangar
base_turf = /turf/simulated/floor/plating
movable_flags = MOVABLE_FLAG_EFFECTMOVE

/obj/shuttle_landmark/reaper/altdock
name = "Docking Port"
Expand Down
2 changes: 1 addition & 1 deletion mods/_maps/sentinel/maps/sentinel-1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4767,6 +4767,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 4
},
/obj/shuttle_landmark/reaper/start,
/turf/simulated/floor/plating,
/area/ship/reaper)
"jc" = (
Expand Down Expand Up @@ -4886,7 +4887,6 @@
icon_state = "1-2"
},
/obj/structure/catwalk,
/obj/shuttle_landmark/reaper/start,
/turf/simulated/floor/plating,
/area/ship/patrol/command/hangar)
"jj" = (
Expand Down
12 changes: 4 additions & 8 deletions mods/utility_items/code/advanced_landing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@

/mob/living/carbon/human/update_dead_sight()
. = ..()
if(!eyeobj)
cancel_landeye_view()
return
if(eyeobj.type == /mob/observer/eye/landeye)
set_see_in_dark(8)
set_see_invisible(SEE_INVISIBLE_MINIMUM)
Expand Down Expand Up @@ -232,7 +235,7 @@
var/zone_good = FALSE
I.loc = T
shadow_images += I
if(!(T.density))
if(T && !(T.density))
for(var/type in accesible_areas)
if(A.type in typesof(type))
zone_good = TRUE
Expand Down Expand Up @@ -323,10 +326,3 @@
var/turf/T = locate(I.loc.x, I.loc.y, I.loc.z)
I = image('mods/utility_items/icons/alphacolors.dmi', T, "dither50")
T.AddOverlays(I)

/datum/shuttle/autodock/process_arrived()
.=..()
for(var/i in 1 to LAZYLEN(next_location.image_shadow))
var/image/I = next_location.image_shadow[i]
var/turf/T = locate(I.loc.x, I.loc.y, I.loc.z)
T.ClearOverlays(I)
Loading