cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Zuhayr
2013-07-04 23:29:48 -07:00
parent a8ea0a3fd4 144af0edad
commit 15de508b49
6 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/shuttle_controller.dm
View File

@@ -280,6 +280,9 @@ datum/shuttle_controller
for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
bug.gib()
for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug...
pest.gib()
start_location.move_contents_to(end_location)
settimeleft(SHUTTLELEAVETIME)
//send2irc("Server", "The Emergency Shuttle has docked with the station.")