Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00
parent 6cbab55ef8 aeacc3ab62
commit 993b4ec222
1129 changed files with 38441 additions and 43871 deletions
@@ -92,6 +92,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
 			say("<span class='danger'>Launch sequence activated! Prepare for drop!!</span>")
 			playsound(loc, 'sound/machines/warning-buzzer.ogg', 70, 0)
 			launch_warning = FALSE
+			log_shuttle("[key_name(usr)] has launched the auxillary base.")
 		else if(!shuttle_error)
 			say("Shuttle request uploaded. Please stand away from the doors.")
 		else