automated hvh round

code/__DEFINES/mode.dm

@@ -146,6 +146,8 @@ GLOBAL_LIST_INIT(ROLES_GROUND, GLOB.ROLES_XENO + ROLES_SPECIAL + ROLES_WHITELIST
 GLOBAL_LIST_INIT(ROLES_DISTRESS_SIGNAL, GLOB.ROLES_USCM + GLOB.ROLES_GROUND)
 GLOBAL_LIST_INIT(ROLES_FACTION_CLASH, ROLES_USCM + JOB_PREDATOR)
 
+GLOBAL_LIST_INIT(ROLES_CM_VS_UPP, ROLES_CIC+  UPP_JOB_LIST)
+
 
 GLOBAL_LIST_INIT(ROLES_UNASSIGNED, list(JOB_SQUAD_MARINE))
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.

code/game/gamemodes/extended/cm_vs_upp.dm

@@ -0,0 +1,13 @@
+/datum/game_mode/extended/faction_clash/cm_vs_upp
+	name = "Faction Clash UPP CM"
+	config_tag = "Faction Clash UPP CM"
+	flags_round_type = MODE_THUNDERSTORM|MODE_FACTION_CLASH
+	toggleable_flags = MODE_NO_SNIPER_SENTRY|MODE_NO_ATTACK_DEAD|MODE_NO_STRIPDRAG_ENEMY|MODE_STRONG_DEFIBS|MODE_BLOOD_OPTIMIZATION|MODE_NO_COMBAT_CAS
+	taskbar_icon = 'icons/taskbar/gml_hvh.png'
+
+/datum/game_mode/extended/faction_clash/cm_vs_upp/get_roles_list()
+	return GLOB.ROLES_CM_VS_UPP
+
+/datum/game_mode/extended/faction_clash/cm_vs_upp/post_setup()
+	. = ..()
+	SSweather.force_weather_holder(/datum/weather_ss_map_holder/faction_clash)

code/modules/gear_presets/upp.dm

@@ -1,3 +1,4 @@
+
 /datum/equipment_preset/upp
 	name = FACTION_UPP
 	languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
@@ -55,6 +56,8 @@
 	idtype = /obj/item/card/id/dogtag
 
 //*****************************************************************************************************/
+/datum/job/antag/upp/should_block_game_interaction(atom/target)
+	. = ..()
 
 /datum/equipment_preset/upp/soldier
 	name = "UPP Soldier"
@@ -223,6 +226,8 @@
 
 //*****************************************************************************************************/
 
+
+
 /datum/equipment_preset/upp/medic
 	name = "UPP Medic"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -393,6 +398,12 @@
 	)
 
 //*****************************************************************************************************/
+/datum/job/antag/upp/sapper
+	title = JOB_UPP_ENGI
+	selection_class = "job_antag"
+	gear_preset = /datum/equipment_preset/upp/sapper
+
+
 
 /datum/equipment_preset/upp/sapper
 	name = "UPP Sapper"

colonialmarines.dme

@@ -779,6 +779,7 @@
 #include "code\game\gamemodes\colonialmarines\whiskey_outpost\skills.dm"
 #include "code\game\gamemodes\colonialmarines\whiskey_outpost\whiskey_output_waves.dm"
 #include "code\game\gamemodes\events\power_failure.dm"
+#include "code\game\gamemodes\extended\cm_vs_upp.dm"
 #include "code\game\gamemodes\extended\extended.dm"
 #include "code\game\gamemodes\extended\extended_clash.dm"
 #include "code\game\gamemodes\extended\extended_nospawn.dm"