UPP Overhaul

code/__DEFINES/job.dm

@@ -276,42 +276,41 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_FORECON_SMARTGUNNER "Reconnaissance Smartgunner"
 
 //-------- UPP --------//
-#define JOB_UPP "UPP Private"
-#define JOB_UPP_CONSCRIPT "UPP Conscript"
-#define JOB_UPP_ENGI "UPP Korporal Sapper"
-#define JOB_UPP_MEDIC "UPP Korporal Medic"
-#define JOB_UPP_SPECIALIST "UPP Serzhant"
-#define JOB_UPP_LEADER "UPP Master Serzhant"
-#define JOB_UPP_POLICE "UPP Politsiya"
-#define JOB_UPP_SUPPLY "UPP Logistics Technician"
-#define JOB_UPP_LT_OFFICER "UPP Leytenant"
-#define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor"
-#define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant"
-#define JOB_UPP_KPT_OFFICER "UPP Kapitan"
-#define JOB_UPP_MAY_OFFICER "UPP Mayjor"
-#define JOB_UPP_LTKOL_OFFICER "UPP Leytenant Kolonel"
-#define JOB_UPP_KOL_OFFICER "UPP Kolonel"
-#define JOB_UPP_MAY_GENERAL "UPP Mayjor General"
-#define JOB_UPP_LT_GENERAL "UPP Leytenant General"
-#define JOB_UPP_GENERAL "UPP Army General"
-
-#define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic"
-#define JOB_UPP_SUPPORT_SYNTH "UPP Support Synthetic"
+#define JOB_UPP "Rifleman"
+#define JOB_UPP_ENGI "Sapper"
+#define JOB_UPP_MEDIC "Sanitar"
+#define JOB_UPP_SPECIALIST "Serzhant"
+#define JOB_UPP_LEADER "Master Serzhant"
+#define JOB_UPP_POLICE "Politsiya"
+#define JOB_UPP_SUPPLY "Logistics Technician"
+#define JOB_UPP_LT_OFFICER "Leytenant"
+#define JOB_UPP_LT_DOKTOR "Leytenant Doktor"
+#define JOB_UPP_SRLT_OFFICER "Senior Leytenant"
+#define JOB_UPP_KPT_OFFICER "Kapitan"
+#define JOB_UPP_MAY_OFFICER "Mayjor"
+#define JOB_UPP_LTKOL_OFFICER "Leytenant Kolonel"
+#define JOB_UPP_KOL_OFFICER "Kolonel"
+#define JOB_UPP_MAY_GENERAL "Mayjor General"
+#define JOB_UPP_LT_GENERAL "Leytenant General"
+#define JOB_UPP_GENERAL "General"
+
+#define JOB_UPP_COMBAT_SYNTH "Combat Synthetic"
+#define JOB_UPP_SUPPORT_SYNTH "Support Synthetic"
 
 #define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMBAT_SYNTH)
 #define UPP_JOB_GRUNT_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_CREWMAN)
 
-#define JOB_UPP_COMMANDO "UPP Junior Kommando"
-#define JOB_UPP_COMMANDO_MEDIC "UPP 2nd Kommando"
-#define JOB_UPP_COMMANDO_LEADER "UPP 1st Kommando"
+#define JOB_UPP_COMMANDO "Junior Kommando"
+#define JOB_UPP_COMMANDO_MEDIC "2nd Kommando"
+#define JOB_UPP_COMMANDO_LEADER "1st Kommando"
 
 #define UPP_COMMANDO_JOB_LIST list(JOB_UPP_COMMANDO, JOB_UPP_COMMANDO_MEDIC, JOB_UPP_COMMANDO_LEADER)
 
 #define JOB_UPP_REPRESENTATIVE "UPP Representative"
 
-#define JOB_UPP_CREWMAN "UPP Tank Crewman"
+#define JOB_UPP_CREWMAN "Tank Crewman"
 
-#define JOB_UPP_COMMISSAR "UPP Political Commissar"
+#define JOB_UPP_COMMISSAR "Political Commissar"
 
 //-------- CLF --------//
 #define JOB_CLF "CLF Guerilla"

code/__DEFINES/language.dm

@@ -20,7 +20,7 @@
 
 #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_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)
 
 //Chinese language sound bitflags
 

code/__DEFINES/mode.dm

@@ -289,6 +289,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #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)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_UPP list(FACTION_UPP)
+#define FACTION_LIST_UPP_COLONY list(FACTION_COLONIST, FACTION_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF)
 #define FACTION_LIST_TWE list(FACTION_TWE)
 #define FACTION_LIST_FREELANCER list(FACTION_FREELANCER)

code/__DEFINES/paygrade_defs/upp.dm

@@ -4,16 +4,16 @@
 /// UE,
 #define PAY_SHORT_UEC "UEC"
 
-/// UE1, Private
+/// UE1, Ryadovoy
 #define PAY_SHORT_UE1 "UE1"
 
-/// UE2, Private First Class
+/// UE2, Efreitor
 #define PAY_SHORT_UE2 "UE2"
 
 /// UE3, Korporal
 #define PAY_SHORT_UE3 "UE3"
 
-/// UE4, unior Serzhant
+/// UE4, Junior Serzhant
 #define PAY_SHORT_UE4 "UE4"
 
 /// UE5, Serzhant
@@ -22,14 +22,17 @@
 /// UE6, Master Serzhant
 #define PAY_SHORT_UE6 "UE6"
 
+/// UE7, Starshina
+#define PAY_SHORT_UE7 "UE7"
+
 /// UC1, Junior Kommando
-#define PAY_SHORT_UC1 "UC1"
+#define PAY_SHORT_UK1 "UK1"
 
 /// UC2, 2nd Kommando
-#define PAY_SHORT_UC2 "UC2"
+#define PAY_SHORT_UK2 "UK2"
 
 /// UC3, 1st Kommando
-#define PAY_SHORT_UC3 "UC3"
+#define PAY_SHORT_UK3 "UK3"
 
 /// UO1, Leytenant
 #define PAY_SHORT_UO1 "UO1"
@@ -60,3 +63,6 @@
 
 /// UO9, Army General
 #define PAY_SHORT_UO9 "UO9"
+
+/// UC1, Militsiya
+#define PAY_SHORT_UC1 "UC1"

code/__DEFINES/radio.dm

@@ -52,7 +52,7 @@
 #define RADIO_CHANNEL_UPP_ENGI "UPP Engi"
 #define RADIO_CHANNEL_UPP_CCT "UPP CCT"
 #define RADIO_CHANNEL_UPP_KDO "UPP Kdo"
-
+#define RADIO_CHANNEL_UPP_GRD "UPP Guard"
 //WY Comms
 #define RADIO_CHANNEL_WY "WY"
 #define RADIO_CHANNEL_PMC_GEN "WY PMC"

code/controllers/subsystem/communications.dm

@@ -93,6 +93,7 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define UPP_MED_FREQ 1254
 #define UPP_CCT_FREQ 1255
 #define UPP_KDO_FREQ 1259
+#define UPP_GRD_FREQ 1256
 
 //CLF Channels (1270-1289)
 #define CLF_FREQ 1271
@@ -197,6 +198,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_UPP_MED = UPP_MED_FREQ,
 	RADIO_CHANNEL_UPP_CCT = UPP_CCT_FREQ,
 	RADIO_CHANNEL_UPP_KDO = UPP_KDO_FREQ,
+	RADIO_CHANNEL_UPP_GRD = UPP_GRD_FREQ,
 
 	RADIO_CHANNEL_CLF_GEN = CLF_FREQ,
 	RADIO_CHANNEL_CLF_CMD = CLF_CMD_FREQ,
@@ -212,7 +214,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 #define ERT_FREQS list(VAI_FREQ, DUT_FREQ, YAUT_FREQ, CMB_FREQ, RMC_FREQ)
 
 // UPP Frequencies
-#define UPP_FREQS list(UPP_FREQ, UPP_CMD_FREQ, UPP_ENGI_FREQ, UPP_MED_FREQ, UPP_CCT_FREQ, UPP_KDO_FREQ)
+#define UPP_FREQS list(UPP_FREQ, UPP_CMD_FREQ, UPP_ENGI_FREQ, UPP_MED_FREQ, UPP_CCT_FREQ, UPP_KDO_FREQ, UPP_GRD_FREQ)
 
 // CLF Frequencies
 #define CLF_FREQS list(CLF_FREQ, CLF_CMD_FREQ, CLF_ENGI_FREQ, CLF_MED_FREQ, CLF_CCT_FREQ)
@@ -295,6 +297,7 @@ SUBSYSTEM_DEF(radio)
 		"[UPP_MED_FREQ]" = "opformed",
 		"[UPP_CCT_FREQ]" = "opforcct",
 		"[UPP_KDO_FREQ]" = "opforspe",
+		"[UPP_GRD_FREQ]" = "opforgrd",
 		"[CLF_FREQ]" = "clfradio",
 		"[CLF_CMD_FREQ]" = "opforcmd",
 		"[CLF_ENGI_FREQ]" = "opforeng",