Merge branch 'master' into TGUIs_Nexties

2020-02-01 00:49:10 -08:00
parent 54cd2585cf 133da9bdef
commit 33122d0d92
19 changed files with 116 additions and 63 deletions
@@ -73,6 +73,7 @@
 #define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
 #define ADMIN_PUNISHMENT_MAZING "Puzzle"
 #define ADMIN_PUNISHMENT_PIE "Cream Pie"
+#define ADMIN_PUNISHMENT_CUSTOM_PIE "Custom Cream Pie"

 #define AHELP_ACTIVE 1
 #define AHELP_CLOSED 2