mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-28 11:03:19 +00:00
Merge pull request #2897 from VOREStation/aro-bstemple
New Away Mission (and minor other stuff)
This commit is contained in:
@@ -322,3 +322,9 @@ var/list/mob/living/forced_ambiance_list = new
|
||||
if(A && A.has_gravity())
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/area/proc/shuttle_arrived()
|
||||
return TRUE
|
||||
|
||||
/area/proc/shuttle_departed()
|
||||
return TRUE
|
||||
|
||||
@@ -60,11 +60,13 @@
|
||||
return TRUE
|
||||
|
||||
// If you need an event to occur when the shuttle jumps in short or long jump, override this.
|
||||
/datum/shuttle/proc/on_shuttle_departure()
|
||||
/datum/shuttle/proc/on_shuttle_departure(var/area/origin)
|
||||
origin.shuttle_departed()
|
||||
return
|
||||
|
||||
// Similar to above, but when it finishes moving to the target. Short jump generally makes this occur immediately after the above proc.
|
||||
/datum/shuttle/proc/on_shuttle_arrival()
|
||||
/datum/shuttle/proc/on_shuttle_arrival(var/area/destination)
|
||||
destination.shuttle_arrived()
|
||||
return
|
||||
|
||||
/datum/shuttle/proc/short_jump(var/area/origin,var/area/destination)
|
||||
@@ -94,7 +96,7 @@
|
||||
move(origin, destination)
|
||||
moving_status = SHUTTLE_IDLE
|
||||
|
||||
on_shuttle_arrival()
|
||||
on_shuttle_arrival(destination)
|
||||
|
||||
make_sounds(destination, HYPERSPACE_END)
|
||||
|
||||
@@ -125,11 +127,12 @@
|
||||
|
||||
depart_time = world.time
|
||||
|
||||
on_shuttle_departure()
|
||||
on_shuttle_departure(departing)
|
||||
|
||||
moving_status = SHUTTLE_INTRANSIT
|
||||
|
||||
move(departing, interim, direction)
|
||||
interim.shuttle_arrived()
|
||||
|
||||
if(process_longjump(departing, destination)) //VOREStation Edit - To hook custom shuttle code in
|
||||
return //VOREStation Edit - It handled it for us (shuttle crash or such)
|
||||
@@ -147,10 +150,11 @@
|
||||
create_warning_effect(destination)
|
||||
sleep(5)
|
||||
|
||||
interim.shuttle_departed()
|
||||
move(interim, destination, direction)
|
||||
moving_status = SHUTTLE_IDLE
|
||||
|
||||
on_shuttle_arrival()
|
||||
on_shuttle_arrival(destination)
|
||||
|
||||
make_sounds(destination, HYPERSPACE_END)
|
||||
|
||||
|
||||
@@ -1493,6 +1493,10 @@
|
||||
to_chat(user,"<span class='warning'>\The [src] can't teleport you that far!</span>")
|
||||
return
|
||||
|
||||
if(uT.block_tele || dT.block_tele)
|
||||
to_chat(user,"<span class='warning'>Something is interfering with \the [src]!</span>")
|
||||
return
|
||||
|
||||
//Bzzt.
|
||||
ready = 0
|
||||
power_source.use(charge_cost)
|
||||
|
||||
Reference in New Issue
Block a user