mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 18:13:34 +01:00
Updates: The Reckoning
* Carp are delicious! Slice them open with a kitchen knife, and you get carp fillets. * Carp gib when hit by meteors. WHen gibbed or exploded, they leave behind meat as well. Pulse rifles can also gib them. * Fixed lizardman emotes. * New cake sprites by matty406 (carrot cake my edit of his cheese and regular cake). * Shuttle can be called in Malf and Revolution modes. HOwever, it'll automatically return after a random duration. The message when the shuttle is recalled due to this is identical to when it's recalled by a player. * Shuttle cannot be called while it is returning to CentCom. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@672 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -16,6 +16,7 @@ datum/shuttle_controller
|
||||
|
||||
endtime // timeofday that shuttle arrives
|
||||
//timeleft = 360 //600
|
||||
fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED"
|
||||
|
||||
|
||||
// call the shuttle
|
||||
@@ -85,6 +86,11 @@ datum/shuttle_controller
|
||||
|
||||
return 0
|
||||
|
||||
else if((fake_recall != 0) && (timeleft <= fake_recall))
|
||||
recall()
|
||||
|
||||
return 0
|
||||
|
||||
else if(timeleft <= 0)
|
||||
location = 1
|
||||
var/area/start_location = locate(/area/shuttle/escape/centcom)
|
||||
|
||||
Reference in New Issue
Block a user