Skip to content

Commit

Permalink
Fixes people getting stuck in tad camera view (#13786)
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanmixo authored Aug 15, 2023
1 parent 89a742f commit 4f3183d
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions code/modules/shuttle/mini_dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@

/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/give_actions(mob/living/user)
if(!user)
if(!current_user)
return
user = current_user
return

for(var/datum/action/action_from_shuttle_docker AS in actions)
action_from_shuttle_docker.remove_action(user)
Expand Down Expand Up @@ -110,15 +108,12 @@
to_transit = FALSE
next_fly_state = destination_fly_state
return
give_actions()
if(fly_state == SHUTTLE_ON_GROUND)
TIMER_COOLDOWN_START(src, COOLDOWN_TADPOLE_LAUNCHING, launching_delay)
if(fly_state != SHUTTLE_IN_ATMOSPHERE)
return
shuttle_port.assigned_transit.reserved_area.set_turf_type(/turf/open/space/transit/atmos)
open_prompt = TRUE
if(ui_user?.Adjacent(src))
open_prompt(ui_user, GLOB.minidropship_start_loc)

///The action of taking off and sending the shuttle to the atmosphere
/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/proc/take_off()
Expand Down Expand Up @@ -159,7 +154,7 @@

/// Toggle the vision between small nightvision and turf vision
/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/proc/toggle_nvg()
if(!check_hovering_spot(eyeobj.loc))
if(!check_hovering_spot(eyeobj?.loc))
to_chat(ui_user, span_warning("Can not toggle night vision mode in caves"))
return
nvg_vision_mode = !nvg_vision_mode
Expand Down

0 comments on commit 4f3183d

Please sign in to comment.