Merge branch 'master' into wound-port

2020-07-21 01:10:51 +01:00
parent 037cec508e b6f689b06d
commit 75a2035774
105 changed files with 695 additions and 263 deletions
@@ -78,6 +78,7 @@
 #define ADMIN_PUNISHMENT_BLEED ":B:loodless"
 #define ADMIN_PUNISHMENT_SCARIFY "Scarify"
 #define ADMIN_PUNISHMENT_PICKLE "Pickle-ify"
+#define ADMIN_PUNISHMENT_FRY "Fry"

 #define AHELP_ACTIVE 1
 #define AHELP_CLOSED 2