From 694942d869c21fdcfbd72e07a9ce9ed11fb545dc Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sun, 20 May 2018 15:13:12 +0200 Subject: [PATCH] Pr/1 (#57) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg * spelfix * Update auto-chat.lua * added make-cofee * added make cofee * fix because I cant spell apperantly * spell fix because I cant spell apperantly * missing = * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? * rhd (thadius suggestion) * lhd message added * Fixed Comment and indentation * rhd changed from shout to messages * I am also a lazy bastard * Update colours.lua * Not needed in commands if present in messages * Fixed missing comma --- Addons/Admin/auto-chat.lua | 5 +++-- StandAlone/colours.lua | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 8a4a02a5..6326b2af 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -22,6 +22,9 @@ local messages = { ['links']={'chat-bot.links'}, ['loop']={'chat-bot.loops'}, ['loops']={'chat-bot.loops'}, + --Thadius suggestion start + ['rhd']={'chat-bot.lhd'}, + --Thadius suggestion end ['roundabout']={'chat-bot.loops'}, ['roundabouts']={'chat-bot.loops'}, ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end @@ -41,8 +44,6 @@ local commands = { ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, - --Thadius suggestion - ['rhd']={'chat-bot.lhd'}, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, ['orderpizza']=function(player) Server.new_thread{ diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index a353c59c..774aaec7 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -6,7 +6,8 @@ local default_colours = { arty714={r=150,g=68,b=161}, Cooldude2606={r=57,g=192,b=207}, mark9064={r=99,g=0,b=255}, - eissturm={r=25,g=25,b=112} + eissturm={r=25,g=25,b=112}, + Sakama={r=20,g=213,b=80} } Event.register(defines.events.on_player_created, function(event)