Merge branch 'sheepishgoat:master' into feature/small-bits-and-bob

This commit is contained in:
AlManiak
2024-10-25 11:31:41 +02:00
committed by GitHub
17 changed files with 188 additions and 9 deletions
+5
View File
@@ -87,6 +87,11 @@
#define ADMIN_PUNISHMENT_FRY "Fry"
#define ADMIN_PUNISHMENT_PERFORATE ":B:erforate"
#define ADMIN_PUNISHMENT_CLUWNE "Cluwne"
// GS13 PUNISHMENTS
#define ADMIN_PUNISHMENT_BONK "Bonk"
#define ADMIN_PUNISHMENT_BREADIFY "Breadify"
#define ADMIN_PUNISHMENT_FATTEN "Fatten"
#define ADMIN_PUNISHMENT_FATTEN_EVIL "Fatten (Permafat)"
#define AHELP_ACTIVE 1
#define AHELP_CLOSED 2
+1
View File
@@ -588,5 +588,6 @@ GLOBAL_LIST_INIT(pda_reskins, list(
#define FATTENING_TYPE_NANITES "nanites"
#define FATTENING_TYPE_RADIATIONS "radiations"
#define FATTENING_TYPE_WEIGHT_LOSS "weight_loss"
#define FATTENING_TYPE_ALMIGHTY "almighty" //This ignores prefs, please only use this for smites and other admin controlled instances.
#define FATNESS_TO_WEIGHT_RATIO 0.25