[To be test merged] Added some features of the Big Mechanized Iron up…

…date (without major map change)

code/__DEFINES/jobs.dm

@@ -74,6 +74,8 @@
 #define F13RANGER	 	 (1<<14)
 #define F13MP            (1<<15)
 #define F13REP           (1<<16)
+#define F13PILOT		 (1<<17)
+#define F13STAFFSERGEANT   (1<<18)
 
 #define LEGION			(1<<4)
 
@@ -105,6 +107,7 @@
 #define F13SCRIBE		(1<<9)
 #define F13INITIATE		(1<<10)
 #define F13OFFDUTYBOS	(1<<11)
+#define F13LANCER		(1<<12)
 
 #define CHURCH			(1<<6)
 
@@ -113,7 +116,7 @@
 #define F13ACOLYTE		(1<<3)
 #define F13NEOPHYTE		(1<<4)
 
-#define DEP_KEBAB 		(1<<7)
+#define DEP_KEBAB 		(1<<9)
 
 #define F13SHOPKEEPER	(1<<0)
 #define F13APPRENTICE	(1<<1)
@@ -122,8 +125,11 @@
 #define F13BARTENDER	(1<<4)
 #define F13CITIZEN		(1<<5)
 #define F13RADIOHOST	(1<<6)
+#define F13MILITIA		(1<<7)
+#define F13MECHANIC		(1<<8)
+#define F13CONSTABLE	(1<<9) 			
 
-#define VAULT			(1<<8)
+#define VAULT			(1<<10)
 
 #define F13OVERSEER		(1<<0)
 #define F13COS			(1<<1)
@@ -158,6 +164,7 @@
 #define F13USAI			(1<<8)
 #define F13USREMNANT    (1<<9)
 #define F13USREMNANTMEDIC (1<<10)
+#define F13USPILOT (1<<11)
 
 #define TRIBAL			(1<<11)
 
@@ -219,84 +226,93 @@
 
 #define JOB_DISPLAY_ORDER_CAPTAIN_NCR 34
 #define JOB_DISPLAY_ORDER_LIEUTENANT 35
-#define JOB_DISPLAY_ORDER_MEDICALOFFICER 36
-#define JOB_DISPLAY_ORDER_REPRESENTATIVE 37
-#define JOB_DISPLAY_ORDER_HEAVYTROOPER 38
-#define JOB_DISPLAY_ORDER_SERGEANT 39
-#define JOB_DISPLAY_ORDER_CORPORAL 40
-#define JOB_DISPLAY_ORDER_COMBATMEDIC 41
-#define JOB_DISPLAY_ORDER_COMBATENGINEER 42
-#define JOB_DISPLAY_ORDER_MILITARYPOLICE 43
-#define JOB_DISPLAY_ORDER_TROOPER 44
-#define JOB_DISPLAY_ORDER_OFFDUTYNCR 45
-#define JOB_DISPLAY_ORDER_VETRANGER 46
-#define JOB_DISPLAY_ORDER_RANGER 47
-
-#define JOB_DISPLAY_ORDER_CENTURION 48
-#define JOB_DISPLAY_ORDER_FRUMENTARIUS 49
-#define JOB_DISPLAY_ORDER_DECANVET 50
-#define JOB_DISPLAY_ORDER_DECAN 51
-#define JOB_DISPLAY_ORDER_DECANREC 52
-#define JOB_DISPLAY_ORDER_VEXILLARIUS 53
-#define JOB_DISPLAY_ORDER_EXPLORER 54
-#define JOB_DISPLAY_ORDER_VETLEGIONARY 55
-#define JOB_DISPLAY_ORDER_LEGIONARY 56
-#define JOB_DISPLAY_ORDER_RECRUITLEG 57
-#define JOB_DISPLAY_ORDER_CAMPFOLLOWER 58
-#define JOB_DISPLAY_ORDER_LEGIONSLAVE 59
-
-#define JOB_DISPLAY_ORDER_ELDER 60
-#define JOB_DISPLAY_ORDER_HEADPALADIN 61
-#define JOB_DISPLAY_ORDER_PALADIN 62
-#define JOB_DISPLAY_ORDER_HEADKNIGHT 63
-#define JOB_DISPLAY_ORDER_SENIORKNIGHT 64
-#define JOB_DISPLAY_ORDER_KNIGHT 65
-#define JOB_DISPLAY_ORDER_HEADSCRIBE 66
-#define JOB_DISPLAY_ORDER_SCRIBE 67
-#define JOB_DISPLAY_ORDER_INITIATE 68
-#define JOB_DISPLAY_ORDER_OFFDUTYBOS 69
-
-#define JOB_DISPLAY_ORDER_F13SHOPKEEPER 70
-#define JOB_DISPLAY_ORDER_F13APPRENTICE 71
-#define JOB_DISPLAY_ORDER_F13MERCENARY 72
-#define JOB_DISPLAY_ORDER_F13BARTENDER 73
-#define JOB_DISPLAY_ORDER_F13MILITIACOM 74
-#define JOB_DISPLAY_ORDER_F13SCAB 75
-#define JOB_DISPLAY_ORDER_F13RADIOHOST 76
-
-#define JOB_DISPLAY_ORDER_F13HIGHPRIEST 77
-#define JOB_DISPLAY_ORDER_F13SERVITOR 78
-#define JOB_DISPLAY_ORDER_F13ACOLYTE 79
-#define JOB_DISPLAY_ORDER_F13NEOPHYTE 80
-
-#define JOB_DISPLAY_ORDER_OVERSEER 81
-#define JOB_DISPLAY_ORDER_COS 82
-#define JOB_DISPLAY_ORDER_VAULTDOCTOR 83
-#define JOB_DISPLAY_ORDER_VAULTSCIENTIST 84
-#define JOB_DISPLAY_ORDER_VAULTSECURITY 85
-#define JOB_DISPLAY_ORDER_VAULTENGINEER 86
-#define JOB_DISPLAY_ORDER_DWELLER 87
-#define JOB_DISPLAY_ORDER_AI 88
-#define JOB_DISPLAY_ORDER_CYBORG 89
-
-#define JOB_DISPLAY_ORDER_WASTELANDER 90
-#define JOB_DISPLAY_ORDER_RAIDER 91
-#define JOB_DISPLAY_ORDER_PUSHER 92
-#define JOB_DISPLAY_ORDER_TRIBAL 93
-
-#define JOB_DISPLAY_ORDER_F13USLT 94
-#define JOB_DISPLAY_ORDER_F13USGYSGT 95
-#define JOB_DISPLAY_ORDER_F13USSGT 96
-#define JOB_DISPLAY_ORDER_F13USAI 97
-#define JOB_DISPLAY_ORDER_F13USSCIENTIST 98
-#define JOB_DISPLAY_ORDER_F13USSPECIALIST 99
-#define JOB_DISPLAY_ORDER_F13USPRIVATE 100
-#define JOB_DISPLAY_ORDER_F13USREMNANT 101
-#define JOB_DISPLAY_ORDER_F13USREMNANTMEDIC 102
-
-#define	JOB_DISPLAY_ORDER_LEADPRACTITIONER 103
-#define	JOB_DISPLAY_ORDER_PRACTITIONER 104
-#define JOB_DISPLAY_ORDER_FOLLOWERGUARD 105
-#define JOB_DISPLAY_ORDER_FOLLOWERVOLUNTEER 106
+#define JOB_DISPLAY_ORDER_STAFFSERGEANT 36
+#define JOB_DISPLAY_ORDER_MEDICALOFFICER 37
+#define JOB_DISPLAY_ORDER_REPRESENTATIVE 38
+#define JOB_DISPLAY_ORDER_HEAVYTROOPER 39
+#define JOB_DISPLAY_ORDER_PILOT_NCR 40
+#define JOB_DISPLAY_ORDER_SERGEANT 41
+#define JOB_DISPLAY_ORDER_CORPORAL 42
+#define JOB_DISPLAY_ORDER_COMBATMEDIC 43
+#define JOB_DISPLAY_ORDER_COMBATENGINEER 44
+#define JOB_DISPLAY_ORDER_MILITARYPOLICE 45
+#define JOB_DISPLAY_ORDER_TROOPER 46
+#define JOB_DISPLAY_ORDER_OFFDUTYNCR 47
+#define JOB_DISPLAY_ORDER_VETRANGER 48
+#define JOB_DISPLAY_ORDER_RANGER 49
+
+#define JOB_DISPLAY_ORDER_CENTURION 50
+#define JOB_DISPLAY_ORDER_FRUMENTARIUS 51
+#define JOB_DISPLAY_ORDER_DECANVET 53
+#define JOB_DISPLAY_ORDER_DECAN 54
+#define JOB_DISPLAY_ORDER_DECANREC 55
+#define JOB_DISPLAY_ORDER_VEXILLARIUS 56
+#define JOB_DISPLAY_ORDER_EXPLORER 57
+#define JOB_DISPLAY_ORDER_VETLEGIONARY 58
+#define JOB_DISPLAY_ORDER_LEGIONARY 59
+#define JOB_DISPLAY_ORDER_RECRUITLEG 60
+#define JOB_DISPLAY_ORDER_CAMPFOLLOWER 61
+#define JOB_DISPLAY_ORDER_LEGIONSLAVE 62
+
+#define JOB_DISPLAY_ORDER_ELDER 63
+#define JOB_DISPLAY_ORDER_HEADPALADIN 64
+#define JOB_DISPLAY_ORDER_PALADIN 65
+#define JOB_DISPLAY_ORDER_HEADKNIGHT 66
+#define JOB_DISPLAY_ORDER_SENIORKNIGHT 67
+#define JOB_DISPLAY_ORDER_KNIGHT 68
+#define JOB_DISPLAY_ORDER_HEADSCRIBE 69
+#define JOB_DISPLAY_ORDER_SCRIBE 70
+#define JOB_DISPLAY_ORDER_LANCER 71
+#define JOB_DISPLAY_ORDER_INITIATE 72
+#define JOB_DISPLAY_ORDER_OFFDUTYBOS 73
+
+#define JOB_DISPLAY_ORDER_F13SHOPKEEPER 74
+#define JOB_DISPLAY_ORDER_F13APPRENTICE 75
+#define JOB_DISPLAY_ORDER_F13MERCENARY 76
+#define JOB_DISPLAY_ORDER_F13BARTENDER 77
+#define JOB_DISPLAY_ORDER_F13MILITIACOM 78
+#define JOB_DISPLAY_ORDER_F13SCAB 79
+#define JOB_DISPLAY_ORDER_F13RADIOHOST 80
+#define JOB_DISPLAY_ORDER_F13MILITIA 113
+#define JOB_DISPLAY_ORDER_F13MECHANIC 114
+#define JOB_DISPLAY_ORDER_F13CONSTABLE	115			
+
+
+#define JOB_DISPLAY_ORDER_F13HIGHPRIEST 81
+#define JOB_DISPLAY_ORDER_F13SERVITOR 82
+#define JOB_DISPLAY_ORDER_F13ACOLYTE 83
+#define JOB_DISPLAY_ORDER_F13NEOPHYTE 84
+
+#define JOB_DISPLAY_ORDER_OVERSEER 85
+#define JOB_DISPLAY_ORDER_COS 86
+#define JOB_DISPLAY_ORDER_VAULTDOCTOR 87
+#define JOB_DISPLAY_ORDER_VAULTSCIENTIST 88
+#define JOB_DISPLAY_ORDER_VAULTSECURITY 89
+#define JOB_DISPLAY_ORDER_VAULTENGINEER 90
+#define JOB_DISPLAY_ORDER_DWELLER 91
+#define JOB_DISPLAY_ORDER_AI 92
+#define JOB_DISPLAY_ORDER_CYBORG 93
+
+#define JOB_DISPLAY_ORDER_WASTELANDER 94
+#define JOB_DISPLAY_ORDER_RAIDER 95
+#define JOB_DISPLAY_ORDER_PUSHER 96
+#define JOB_DISPLAY_ORDER_TRIBAL 97
+
+#define JOB_DISPLAY_ORDER_CAPTAIN_US 98
+#define JOB_DISPLAY_ORDER_F13USLT 99
+#define JOB_DISPLAY_ORDER_F13USGYSGT 100
+#define JOB_DISPLAY_ORDER_F13USPILOT 101
+#define JOB_DISPLAY_ORDER_F13USSGT 102
+#define JOB_DISPLAY_ORDER_F13USAI 103
+#define JOB_DISPLAY_ORDER_F13USSCIENTIST 104
+#define JOB_DISPLAY_ORDER_F13USSPECIALIST 105
+#define JOB_DISPLAY_ORDER_F13USPRIVATE 106
+#define JOB_DISPLAY_ORDER_F13USREMNANT 107
+#define JOB_DISPLAY_ORDER_F13USREMNANTMEDIC 108
+
+#define	JOB_DISPLAY_ORDER_LEADPRACTITIONER 109
+#define	JOB_DISPLAY_ORDER_PRACTITIONER 110
+#define JOB_DISPLAY_ORDER_FOLLOWERGUARD 111
+#define JOB_DISPLAY_ORDER_FOLLOWERVOLUNTEER 112
 
 GLOBAL_LIST_INIT(faction_list, list(FACTION_NCR, FACTION_LEGION, FACTION_BROTHERHOOD, FACTION_KEBAB, FACTION_ENCLAVE, FACTION_WASTELAND, FACTION_RAIDERS, FACTION_CHURCH))