Merge branch 'master' into xeno-blood

code/__DEFINES/job.dm

@@ -192,6 +192,27 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 //------------------------------------
 
+//-------- US Army --------//
+#define JOB_ARMY_TROOPER "Army Trooper"
+#define JOB_ARMY_ENGI "Army Sapper"
+#define JOB_ARMY_MEDIC "Army Medic"
+#define JOB_ARMY_NCO "Army Fireteam Lead"
+#define JOB_ARMY_SNCO "Army Squad Leader"
+#define JOB_ARMY_LT "Army Lieutenant"
+
+//-------- USASF --------//
+#define JOB_NAVY_CREWMAN "USASF Crewman"
+#define JOB_NAVY_MEDIC "USASF Hospital Corpsman"
+#define JOB_NAVY_ENGI "USASF Engineering Technician"
+#define JOB_NAVY_SKITTLE "USASF Flight-Deck Crewman"
+#define JOB_NAVY_JTAC "USASF Orbital Fire-Support Liason Officer"
+#define JOB_NAVY_PARA_TECH "USASF Para-Rescue Support Technician"
+#define JOB_NAVY_SYNTH "USASF Support Synthetic"
+#define JOB_NAVY_CHIEF_ENGINEER "USASF Engineering Duty Officer"
+#define JOB_NAVY_FLIGHT_BOSS "USASF Flight-Deck Officer"
+#define JOB_NAVY_SO "USASF Duty Officer"
+#define JOB_NAVY_CO "USASF Commanding Officer"
+
 //-------- PMC --------//
 #define JOB_PMC_STANDARD "PMC Operator"
 #define JOB_PMC_ENGINEER "PMC Corporate Technician"

code/__DEFINES/language.dm

@@ -19,9 +19,9 @@
 
 #define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_RUSPATOIS)
 
-#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
+#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_RUSPATOIS, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
 
-#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
+#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_RUSPATOIS, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
 
 //Chinese language sound bitflags
 

code/__DEFINES/mode.dm

@@ -261,6 +261,8 @@ DEFINE_BITFIELD(whitelist_status, list(
 // Faction names
 #define FACTION_NEUTRAL "Neutral"
 #define FACTION_MARINE "USCM"
+#define FACTION_ARMY "USA"
+#define FACTION_NAVY "USASF"
 #define FACTION_SURVIVOR "Survivor"
 #define FACTION_UPP "UPP"
 #define FACTION_TWE "TWE"
@@ -283,7 +285,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_ZOMBIE "Zombie"
 #define FACTION_MONKEY "Monkey" // Nanu
 
-#define FACTION_LIST_MARINE list(FACTION_MARINE)
+#define FACTION_LIST_MARINE list(FACTION_MARINE, FACTION_ARMY, FACTION_NAVY)
 #define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE)
 #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
 #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)

code/__DEFINES/paygrade_defs/marines.dm

@@ -37,6 +37,21 @@
 /// ME9C, Sergeant Major of the Colonial Marine Corps
 #define PAY_SHORT_ME9C "ME9C"
 
+/// MW1, Warrant Officer 1
+#define PAY_SHORT_MW1 "MW1"
+
+/// MW2, Chief Warrant Officer 2
+#define PAY_SHORT_MW2 "MCW2"
+
+/// MW3, Chief Warrant Officer 3
+#define PAY_SHORT_MW3 "MCW3"
+
+/// MW4, Chief Warrant Officer 4
+#define PAY_SHORT_MW4 "MCW4"
+
+/// MW5, Chief Warrant Officer 5
+#define PAY_SHORT_MW5 "MCW5"
+
 /// MO1, Second Lieutenant
 #define PAY_SHORT_MO1 "MO1"
 

code/__DEFINES/paygrade_defs/navy.dm

@@ -38,16 +38,16 @@
 /// NW1, Warrant Officer 1
 #define PAY_SHORT_NW1 "NW1"
 
-/// NW1, Chief Warrant Officer 2
+/// NW2, Chief Warrant Officer 2
 #define PAY_SHORT_NW2 "NCW2"
 
-/// NW1, Chief Warrant Officer 3
+/// NW3, Chief Warrant Officer 3
 #define PAY_SHORT_NW3 "NCW3"
 
-/// NW1, Chief Warrant Officer 4
+/// NW4, Chief Warrant Officer 4
 #define PAY_SHORT_NW4 "NCW4"
 
-/// NW1, Chief Warrant Officer 5
+/// NW5, Chief Warrant Officer 5
 #define PAY_SHORT_NW5 "NCW5"
 
 /// NO1, Ensign

code/__DEFINES/radio.dm

@@ -37,6 +37,8 @@
 #define RADIO_CHANNEL_REQ "Req"
 #define RADIO_CHANNEL_SENTRY "Sentry Network"
 #define RADIO_CHANNEL_SPECIAL "special"
+#define RADIO_CHANNEL_USASF "USASF"
+#define RADIO_CHANNEL_US_ARMY "US Army"
 
 //CLF Comms
 #define RADIO_CHANNEL_CLF_GEN "CLF"

code/controllers/subsystem/communications.dm

@@ -76,6 +76,8 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define VAI_FREQ 1215
 #define RMC_FREQ 1216
 #define CMB_FREQ 1220
+#define ASF_FREQ 1224
+#define ARM_FREQ 1228
 
 //WY Channels (1230-1249)
 #define WY_FREQ 1231
@@ -150,6 +152,8 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_YAUTJA = YAUT_FREQ,
 	RADIO_CHANNEL_VAI = VAI_FREQ,
 	RADIO_CHANNEL_CMB = CMB_FREQ,
+	RADIO_CHANNEL_USASF = ASF_FREQ,
+	RADIO_CHANNEL_US_ARMY = ARM_FREQ,
 	RADIO_CHANNEL_DUTCH_DOZEN = DUT_FREQ,
 	RADIO_CHANNEL_ROYAL_MARINE = RMC_FREQ,
 
@@ -224,7 +228,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 #define BUG_FREQS list(BUG_A_FREQ, BUG_B_FREQ)
 
 //Depts - used for colors in headset.dm, as well as deciding what the marine comms tower can listen into
-#define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ)
+#define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ, ASF_FREQ, ARM_FREQ)
 
 #define TRANSMISSION_WIRE 0
 #define TRANSMISSION_RADIO 1
@@ -275,6 +279,8 @@ SUBSYSTEM_DEF(radio)
 		"[VAI_FREQ]" = "vairadio",
 		"[RMC_FREQ]" = "rmcradio",
 		"[CMB_FREQ]" = "cmbradio",
+		"[ASF_FREQ]" = "usasfradio",
+		"[ARM_FREQ]" = "armyradio",
 		"[ALPHA_FREQ]" = "alpharadio",
 		"[BRAVO_FREQ]" = "bravoradio",
 		"[CHARLIE_FREQ]" = "charlieradio",

code/datums/paygrades/factions/uscm/marine.dm

@@ -102,14 +102,56 @@
 	ranking = 11
 	pay_multiplier = 3
 
+// WARRANT OFFICER PAYGRADES
+
+/datum/paygrade/marine/w1
+	paygrade = PAY_SHORT_MW1
+	name = "Warrant Officer"
+	prefix = "WO"
+	rank_pin = /obj/item/clothing/accessory/ranks/marine/w1
+	ranking = 12
+	pay_multiplier = 2.75	//Pay on par with E7 to begin with
+
+/datum/paygrade/marine/w2
+	paygrade = PAY_SHORT_MW2
+	name = "Chief Warrant Officer 2"
+	prefix = "CWO2"
+	rank_pin = /obj/item/clothing/accessory/ranks/marine/w2
+	ranking = 13
+	pay_multiplier = 2.9
+
+/datum/paygrade/marine/w3
+	paygrade = PAY_SHORT_MW3
+	name = "Chief Warrant Officer 3"
+	prefix = "CWO3."
+	rank_pin = /obj/item/clothing/accessory/ranks/marine/w3
+	ranking = 14
+	pay_multiplier = 3
+
+/datum/paygrade/marine/w4
+	paygrade = PAY_SHORT_MW4
+	name = "Chief Warrant Officer 4"
+	prefix = "CWO4"
+	rank_pin = /obj/item/clothing/accessory/ranks/marine/w4
+	ranking = 15
+	pay_multiplier = 3.2
+
+/datum/paygrade/marine/w5
+	paygrade = PAY_SHORT_MW5
+	name = "Chief Warrant Officer 5"
+	prefix = "CWO5"
+	rank_pin = /obj/item/clothing/accessory/ranks/marine/w5
+	ranking = 16
+	pay_multiplier = 3.5
+
 // COMMISSIONED PAYGRADES
 
 /datum/paygrade/marine/o1
 	paygrade = PAY_SHORT_MO1
 	name = "Second Lieutenant"
 	prefix = "2ndLt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o1
-	ranking = 12
+	ranking = 17
 	pay_multiplier = 3
 	officer_grade = GRADE_OFFICER
 
@@ -118,7 +160,7 @@
 	name = "First Lieutenant"
 	prefix = "1stLt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o2
-	ranking = 13
+	ranking = 18
 	pay_multiplier = 3.2
 	officer_grade = GRADE_OFFICER
 
@@ -127,7 +169,7 @@
 	name = "Captain"
 	prefix = "Capt"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o3
-	ranking = 14
+	ranking = 19
 	pay_multiplier = 4
 	officer_grade = GRADE_OFFICER
 
@@ -136,7 +178,7 @@
 	name = "Major"
 	prefix = "Maj"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o4
-	ranking = 15
+	ranking = 20
 	pay_multiplier = 4
 	officer_grade = GRADE_OFFICER
 
@@ -145,7 +187,7 @@
 	name = "Lieutenant Colonel"
 	prefix = "LtCol"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o5
-	ranking = 16
+	ranking = 21
 	pay_multiplier = 4.2
 	officer_grade = GRADE_OFFICER
 
@@ -155,7 +197,7 @@
 	name = "Colonel"
 	prefix = "Col"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o6
-	ranking = 17
+	ranking = 22
 	pay_multiplier = 4.4
 	officer_grade = GRADE_OFFICER
 
@@ -164,7 +206,7 @@
 	name = "Senior Colonel"
 	prefix = "Snr Col."
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o6e
-	ranking = 18
+	ranking = 23
 	pay_multiplier = 4.6
 	officer_grade = GRADE_OFFICER
 
@@ -173,7 +215,7 @@
 	name = "Division Colonel"
 	prefix = "Div Col."
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o6c
-	ranking = 19
+	ranking = 24
 	pay_multiplier = 4.8
 	officer_grade = GRADE_OFFICER
 
@@ -183,7 +225,7 @@
 	name = "Brigadier General"
 	prefix = "BGen"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o7
-	ranking = 20
+	ranking = 25
 	pay_multiplier = 6
 	officer_grade = GRADE_FLAG
 
@@ -192,7 +234,7 @@
 	name = "Major General"
 	prefix = "MajGen"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o8
-	ranking = 21
+	ranking = 26
 	pay_multiplier = 6.2
 	officer_grade = GRADE_FLAG
 
@@ -201,7 +243,7 @@
 	name = "Lieutenant General"
 	prefix = "LtGen"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o9
-	ranking = 22
+	ranking = 27
 	pay_multiplier = 6.4
 	officer_grade = GRADE_FLAG
 
@@ -210,7 +252,7 @@
 	name = "General"
 	prefix = "Gen"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o10
-	ranking = 23
+	ranking = 28
 	pay_multiplier = 6.6
 	officer_grade = GRADE_FLAG
 
@@ -219,7 +261,7 @@
 	name = "Assistant Commandant of the Marine Corps"
 	prefix = "ACMC"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o10c
-	ranking = 24
+	ranking = 29
 	pay_multiplier = 6.8
 	officer_grade = GRADE_FLAG
 
@@ -228,6 +270,6 @@
 	name = "Commandant of the Marine Corps"
 	prefix = "CMC"
 	rank_pin = /obj/item/clothing/accessory/ranks/marine/o10c
-	ranking = 25
+	ranking = 30
 	pay_multiplier = 7
 	officer_grade = GRADE_FLAG

code/datums/paygrades/factions/uscm/navy.dm

@@ -120,7 +120,7 @@
 	ranking = 13
 	pay_multiplier = 3.3
 
-/datum/paygrade/navy/w1
+/datum/paygrade/navy/w4
 	paygrade = PAY_SHORT_NW4
 	name = "Chief Warrant Officer 4"
 	prefix = "CWO4."