cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Let all ferry shuttles ignore docking codes.

Browse Source 
Ferry shuttles generally shouldn't have to worry about docking codes.  Thats for exploration or antag shuttles. Therefore let them read the docking codes and dock anyway.
Given we put this on all ferry shuttles, we don't need specific code for it on the supply shuttle anymore.
This commit is contained in:
Leshana
2020-03-23 15:46:30 -04:00
parent f6835c639a
commit ff0fe0ef86
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/embedded_controller/docking_program.dm
+1 -1
View File
@@ -117,7 +117,7 @@
if(docking_codes)
var/code = signal.data["code"]
if(code != docking_codes)
testing("Controller [id_tag] got request_dock but code:[code] != docking_codes:[docking_codes]")
log_debug("Controller [id_tag] got request_dock but code:[code] != docking_codes:[docking_codes]")
return
control_mode = MODE_SERVER
code/modules/shuttles/shuttle_ferry.dm
+6
View File
@@ -48,3 +48,9 @@
/datum/shuttle/autodock/ferry/process_arrived()
..()
next_location = get_location_waypoint(!location)
// Ferry shuttles should generally always be able to dock. So read the docking codes off of the target.
/datum/shuttle/autodock/ferry/update_docking_target(var/obj/effect/shuttle_landmark/location)
..()
if(active_docking_controller && active_docking_controller.docking_codes)
set_docking_codes(active_docking_controller.docking_codes)
code/modules/shuttles/shuttle_supply.dm
-6
View File
@@ -79,9 +79,3 @@
/datum/shuttle/autodock/ferry/supply/proc/eta_minutes()
var/ticksleft = arrive_time - world.time
return round(ticksleft/600,1)
// Read the docking codes off of the target to make sure we can always dock.
/datum/shuttle/autodock/ferry/supply/update_docking_target(var/obj/effect/shuttle_landmark/location)
..()
if(active_docking_controller && active_docking_controller.docking_codes)
set_docking_codes(active_docking_controller.docking_codes)