diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 6701944b..ed121e95 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -46,6 +46,11 @@ local commands = { ['lenny']={'chat-bot.lenny'}, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, + ['makepopcorn']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.get-popcorn-2',self.data}} end + end):open() return {'chat-bot.get-popcorn-1'} end, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index d962a738..2bdb3299 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -8,6 +8,7 @@ local default_colours = { mark9064={r=99,g=0,b=255}, eissturm={r=25,g=25,b=112}, Sakama={r=20,g=213,b=80}, + Sakama={r=20,g=213,b=80}, freek18={r=50,g=0,b=255}, aldldl={r=0,g=131,b=255}, NAD4X4={r=135,g=206,b=250}, diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 9c6598bf..84b1da76 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -38,4 +38,6 @@ get-cocktail-1= 🍸 Inintiating mind reading unit... 🍸 get-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸 get-cocktail-3=🍸 __1__ your cocktail is done.🍸 lhd=All trains must be LHD! -food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ \ No newline at end of file +food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ +get-popcorn-1=Heating the oil and waiting for the popping sound... +get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold. \ No newline at end of file