cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way.

Browse Source
This commit is contained in:
Ispil
2013-07-04 04:55:24 -07:00
parent 907d47e8aa
commit 4c1bb073ff
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

@@ -279,6 +279,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.")