alberyk 8cd6f9ca66 Merge branch 'master' into final_shuttle_touches_and_stuff ...

# Conflicts:
#	icons/turf/shuttle.dmi

2022-01-17 22:20:15 -03:00

..

antagonist.dm

evil computer

2021-10-10 20:00:37 -03:00

city.dm

Adds rooftop event assets (#12572)

2021-10-06 19:21:15 -03:00

departmental.dm

Reconstructible Research Shuttle Console (#12736)

2021-11-08 00:53:56 +01:00

escape_pods.dm

Ports Bay's updated evacuation controller and bluespace jump. (#12445)

2021-09-07 17:12:10 +02:00

landmarks.dm

Overmap exoplanet generation, ported from Bay. (#12362)

2022-01-17 22:16:48 -03:00

shuttle_arrival.dm

Away Mission Events (#12802)

2021-12-04 02:23:24 +01:00

shuttle_autodock.dm

Flight Helmets (#11834)

2021-05-12 21:41:01 +02:00

shuttle_autoreturn.dm

…

shuttle_console_multi.dm

…

shuttle_console.dm

console stuff

2021-10-10 15:08:16 -03:00

shuttle_emergency.dm

Fixes evac shuttles being called as transfer shuttles, fixes shuttle arrive time announcement. (#12876)

2021-12-30 22:10:05 +01:00

shuttle_ferry.dm

…

shuttle_lift.dm

…

shuttle_specops.dm

…

shuttle_supply.dm

…

shuttle.dm

Overmap exoplanet generation, ported from Bay. (#12362)

2022-01-17 22:16:48 -03:00

shuttles_multi.dm

…