Merge branch 'master' into dynamicport

2021-09-19 17:59:09 -04:00
parent 0b5a7c9759 6e30018618
commit 13323d2597
91 changed files with 6778 additions and 2292 deletions
@@ -42,6 +42,7 @@
 #define CLOWN			(1<<11)
 #define MIME			(1<<12)
 #define ASSISTANT		(1<<13)
+#define PRISONER		(1<<14)

 #define JOB_AVAILABLE 0
 #define JOB_UNAVAILABLE_GENERIC 1
@@ -89,3 +90,4 @@
 #define JOB_DISPLAY_ORDER_WARDEN 31
 #define JOB_DISPLAY_ORDER_DETECTIVE 32
 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33
+#define JOB_DISPLAY_ORDER_PRISONER 34
@@ -347,3 +347,5 @@

 /// obtained from mapping helper
 #define MAPPING_HELPER_TRAIT "mapping-helper"
+/// Trait associated with mafia
+#define MAFIA_TRAIT "mafia"