Merge branch 'master' into wound-port

2020-07-18 21:45:24 +01:00
parent fe79c53f04 e165524763
commit 974b80a2fd
993 changed files with 34775 additions and 40981 deletions
@@ -77,6 +77,7 @@
 #define ADMIN_PUNISHMENT_CRACK ":B:oneless"
 #define ADMIN_PUNISHMENT_BLEED ":B:loodless"
 #define ADMIN_PUNISHMENT_SCARIFY "Scarify"
+#define ADMIN_PUNISHMENT_PICKLE "Pickle-ify"

 #define AHELP_ACTIVE 1
 #define AHELP_CLOSED 2