Merge branch 'master' into shoelaces

This commit is contained in:
silicons
2020-07-16 17:31:41 -07:00
committed by GitHub
1023 changed files with 35835 additions and 42060 deletions
+1
View File
@@ -75,6 +75,7 @@
#define ADMIN_PUNISHMENT_PIE "Cream Pie"
#define ADMIN_PUNISHMENT_CUSTOM_PIE "Custom Cream Pie"
#define ADMIN_PUNISHMENT_SHOES "Knot Shoes"
#define ADMIN_PUNISHMENT_PICKLE "Pickle-ify"
#define AHELP_ACTIVE 1
#define AHELP_CLOSED 2