cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc shuttle fixes (#8640)

Browse Source
This commit is contained in:
fernerr
2020-04-11 00:59:56 -03:00
committed by GitHub
parent 2d66d5727e
commit 3bb076f38b
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/responseteam.dm
+3 -3
View File
@@ -140,12 +140,12 @@
SSresponseteam.trigger_armed_response_team(choice)
/hook/shuttle_moved/proc/close_response_blastdoors(var/area/departing, var/area/destination)
/hook/shuttle_moved/proc/close_response_blastdoors(var/obj/effect/shuttle_landmark/start_location, var/obj/effect/shuttle_landmark/destination)
//Check if we are departing from the Odin
if(istype(departing,/area/shuttle/specops/centcom))
if(start_location.landmark_tag == "nav_ert_start")
SSresponseteam.close_ert_blastdoors()
//Check if we are departing from the TCFL base
else if(istype(departing,/area/shuttle/legion/centcom))
else if(start_location.landmark_tag == "nav_legion_start")
SSresponseteam.close_tcfl_blastdoors()
return TRUE
code/modules/shuttles/departmental.dm
+2 -2
View File
@@ -14,10 +14,10 @@
req_access = list(access_research)
circuit = /obj/item/circuitboard/research_shuttle
/datum/shuttle/autodock/ferry/research
/datum/shuttle/autodock/ferry/research_aurora
var/triggered_away_sites = FALSE
/datum/shuttle/autodock/ferry/research/shuttle_moved()
/datum/shuttle/autodock/ferry/research_aurora/shuttle_moved()
. = ..()
if(!triggered_away_sites)
for(var/s in SSghostroles.spawners)
code/modules/shuttles/shuttle.dm
+4
View File
@@ -71,7 +71,10 @@
/datum/shuttle/proc/short_jump(var/obj/effect/shuttle_landmark/destination)
if(moving_status != SHUTTLE_IDLE) return
var/obj/effect/shuttle_landmark/start_location = current_location
moving_status = SHUTTLE_WARMUP
callHook("shuttle_moved", list(start_location,destination))
if(sound_takeoff)
playsound(current_location, sound_takeoff, 50, 20, is_global = TRUE)
spawn(warmup_time*10)
@@ -95,6 +98,7 @@
var/obj/effect/shuttle_landmark/start_location = current_location
moving_status = SHUTTLE_WARMUP
callHook("shuttle_moved", list(start_location, destination))
if(sound_takeoff)
playsound(current_location, sound_takeoff, 100, 20, is_global = TRUE)
spawn(warmup_time*10)
code/modules/shuttles/shuttle_emergency.dm
+2 -3
View File
@@ -25,9 +25,7 @@
emergency_shuttle.launch_time = world.time
/datum/shuttle/autodock/ferry/emergency/shuttle_moved()
if (next_location != waypoint_station) //leaving the station
emergency_shuttle.departed = TRUE
if (!emergency_shuttle.departed && next_location != waypoint_station) //leaving the station
var/list/replacements = list(
"%ETA%" = round(emergency_shuttle.estimate_arrival_time()/60,1),
"%dock%" = current_map.dock_name
@@ -36,6 +34,7 @@
priority_announcement.Announce(replacemany(current_map.emergency_shuttle_leaving_dock, replacements))
else
priority_announcement.Announce(replacemany(current_map.shuttle_leaving_dock, replacements))
emergency_shuttle.departed = TRUE
..()
/datum/shuttle/autodock/ferry/emergency/can_launch(var/user)
html/changelogs/Ferner-200411-bugfix_miscshuttlestuff.yml
+4
View File
@@ -0,0 +1,4 @@
author: Ferner
delete-after: True
changes:
- bugfix: "Fixed the transfer shuttle sending an announcement twice. Fixed the research shuttle not triggering away site ghost spawners. Fixed ert/tcfl shuttles not triggering blastdoors containing their areas."