From f006f9d918af0e96f02e2735c143a1eec8ba25dd Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Sun, 16 Aug 2015 19:36:44 +0100 Subject: [PATCH] Fixes some glitches with Orion Trail events, Fixes Orion Trail events not properly choosing from the entire pool of events. --- code/game/machinery/computer/arcade.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6adfae84255..223f9024d2b 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -477,7 +477,7 @@ if(lings_aboard) if(event == ORION_TRAIL_LING || prob(55)) event = ORION_TRAIL_LING_ATTACK - event() + event() turns += 1 if(emagged) var/mob/living/carbon/M = usr //for some vars @@ -568,13 +568,13 @@ turns += 1 event = null else if(href_list["useengine"]) //use parts - engine -= 1 + engine = max(0, --engine) event = null else if(href_list["useelec"]) //use parts - electronics -= 1 + electronics = max(0, --electronics) event = null else if(href_list["usehull"]) //use parts - hull -= 1 + hull = max(0, --hull) event = null else if(href_list["wait"]) //wait 3 days food -= ((alive+lings_aboard)*2)*3 @@ -789,7 +789,7 @@ if(ORION_TRAIL_LING) eventdat += "Strange reports warn of changelings infiltrating crews on trips to Orion..." - if(settlers.len <= 1) + if(settlers.len <= 2) eventdat += "
Your crew's chance of reaching Orion is so slim the changelings likely avoided your ship..." eventdat += "

Continue

" eventdat += "

Close

"