summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelSergey <sergey.ichtchenko@gmail.com>2015-10-20 19:45:53 +0300
committerPixelSergey <sergey.ichtchenko@gmail.com>2015-10-20 19:45:53 +0300
commite036716a62e7e011c2d9df6a4aa37d9f17770c73 (patch)
treeac3b6929092de0d6ea9bcf4bf11cd63f54282b69
parentfb7871bb3b65d0300cc08a97cb0a2413a866feed (diff)
Remembered to edit main.py :)
-rw-r--r--main.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/main.py b/main.py
index b66b3ac..0f436a8 100644
--- a/main.py
+++ b/main.py
@@ -54,8 +54,11 @@ shared["load_modules"] = [
"webtoken",
# Adds /lol, broadcasts random funyy messages. A bit like the splash text in the menu
"saylol",
+<<<<<<< HEAD
+=======
# Adds /signalstrength, lets you request a signal strength and an amount of items will be inserted into target container to meet that strength.
"signalstrength",
+>>>>>>> b4f5a68e4e3ba4993e8326d2f11f9582933b694e
# Shows the owner of a skull when right-clicked
"skullclick",
# Adds /listen, highlights chat and plays a sound when your name was mentioned
@@ -74,6 +77,8 @@ shared["load_modules"] = [
"check",
# Adds /an, a command you can use to share thoughts/plans/news
"adminnotes",
+ # Adds busy status to players
+ "imbusy",
# Adds /imout, displays fake leave/join messages
"imout",
#adds snowbrawl minigame