So I can update scripts safely (for now)
Put this back now
Only send user to Tohjo if in no other chans
Merge pull request #601 from Fuzzysqurl/patch-9

Only send user to Tohjo if in no other chans
Config thing for Samph.

Assuming it works.
VGC added to pokebank list
Merge branch 'master' of github.com:po-devs/po-server-goodies
Merge pull request #602 from BeastCharizard/patch-12

Config thing for Samph.
Notice
Merge branch 'master' of github.com:po-devs/po-server-goodies
Make it return correct berry power for gen 6
Free Deoxys-S
Autogames on/off

hopefully it works and you can merge this time.
Clean up, reorder, update, create, optimize

Changelog:
-gamemsg empty string returns silent
-~Arg~ replacement function for night actions and defensive modes (standby will come after rewrite)
-function to determine if a or n is required
-changed the message for updating a disabled theme
-merged "lynch" and "onDeath"
-fixed annoying semicolon in "not enough players" message
-replaced start up with mafia.showownrole
-added night1 ticks, default value is +10 seconds to night 1
-added [curse/convert/copy]failmsg, poisonmsg, poisontarmsg, cursemsg, usermsg to copy
-condensed previously missed message functions
-revealTarget hax
-reordered script to keep related functions and data together
-added noplur (causes lynch if half the players, regardless of vote power, vote for someone)
-even checked lint (!!)
Enslave Lucarionite
Something doesn't belong here
Meowstic-F was allowed in LC. Not anymore!
Merge pull request #608 from Fuzzysqurl/patch-3

Something doesn't belong here (Meowstic-F)
Merge branch 'patch-14' of github.com:BeastCharizard/po-server-goodies into BeastCharizard-patch-14
.