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

Merge branch 'master' into final_shuttle_touches_and_stuff

Browse Source 
# Conflicts:
#	icons/turf/shuttle.dmi
This commit is contained in:
alberyk
2022-01-17 22:20:15 -03:00
parent e92d839fbf 5bcf84cb23
commit 8cd6f9ca66
84 changed files with 2321 additions and 4654 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttles/landmarks.dm
+1 -1
View File
@@ -95,7 +95,7 @@
/obj/effect/shuttle_landmark/automatic
name = "Navpoint"
landmark_tag = "navpoint"
flags = SLANDMARK_FLAG_AUTOSET
landmark_flags = SLANDMARK_FLAG_AUTOSET
/obj/effect/shuttle_landmark/automatic/Initialize()
landmark_tag += "-[x]-[y]-[z]"
code/modules/shuttles/shuttle.dm
+6 -3
View File
@@ -86,7 +86,7 @@
moving_status = SHUTTLE_WARMUP
callHook("shuttle_moved", list(start_location,destination))
if(sound_takeoff)
playsound(current_location, sound_takeoff, 50, 20, is_global = TRUE)
playsound(current_location, sound_takeoff, 25, 20, is_global = TRUE)
spawn(warmup_time*10)
if(moving_status == SHUTTLE_IDLE)
return FALSE //someone cancelled the launch
@@ -110,7 +110,7 @@
moving_status = SHUTTLE_WARMUP
callHook("shuttle_moved", list(start_location, destination))
if(sound_takeoff)
playsound(current_location, sound_takeoff, 100, 20, is_global = TRUE)
playsound(current_location, sound_takeoff, 50, 20, is_global = TRUE)
spawn(warmup_time*10)
if(moving_status == SHUTTLE_IDLE)
return //someone cancelled the launch
@@ -128,7 +128,7 @@
while (world.time < arrive_time)
if(!fwooshed && (arrive_time - world.time) < 100)
fwooshed = 1
playsound(destination, sound_landing, 100, 20, is_global = TRUE)
playsound(destination, sound_landing, 50, 20, is_global = TRUE)
sleep(5)
if(!attempt_move(destination))
attempt_move(start_location) //try to go back to where we started. If that fails, I guess we're stuck in the interim location
@@ -156,7 +156,10 @@
for(var/area/A in shuttle_area)
testing("Moving [A]")
translation += get_turf_translation(get_turf(current_location), get_turf(destination), A.contents)
var/old_location = current_location
shuttle_pre_move_event.raise_event(src, old_location, destination)
shuttle_moved(destination, translation)
shuttle_moved_event.raise_event(src, old_location, destination)
destination.shuttle_arrived(src)
return TRUE