hopefully last commit

code/__DEFINES/access.dm

@@ -108,11 +108,17 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 #define ACCESS_UPP_FLIGHT 235
 #define ACCESS_UPP_RESEARCH 236
 
+#define ACCESS_UPP_SQUAD_ONE 237
+#define ACCESS_UPP_SQUAD_TWO 238
+
 #define ACCESS_UPP_COMMANDO 239
 #define ACCESS_UPP_LEADERSHIP 240
 ///Senior leadership, the highest ranks
 #define ACCESS_UPP_SENIOR_LEAD 241
 
+#define ACCESS_UPP_MEDPREP 242
+#define ACCESS_UPP_MACHINEGUN 243
+#define ACCESS_UPP_TLPREP 244
 //=================================================
 
 //Colonial Liberation Front access levels (260-289)
@@ -196,6 +202,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 
 ///All access levels associated with UPP
 #define ACCESS_LIST_UPP_ALL "UPP (ALL)"
+#define ACCESS_LIST_UPP_PLATOON "UPP (Platoon)"
 
 ///Generic/basic access to CLF stuff
 #define ACCESS_LIST_CLF_BASE "CLF (Basic)"

code/__DEFINES/minimap.dm

@@ -63,6 +63,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_FOXTROT "#fe7b2e"
 #define MINIMAP_SQUAD_SOF "#400000"
 #define MINIMAP_SQUAD_INTEL "#053818"
+#define MINIMAP_SQUAD_UPP "#B22222"
 
 #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820"
 #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f"

code/game/jobs/access.dm

@@ -286,6 +286,19 @@
 				ACCESS_UPP_SENIOR_LEAD,
 			) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE)
 
+		if(ACCESS_LIST_UPP_PLATOON)
+			return list(
+				ACCESS_UPP_GENERAL,
+				ACCESS_UPP_MEDICAL,
+				ACCESS_UPP_FLIGHT,
+				ACCESS_UPP_LEADERSHIP,
+				ACCESS_UPP_SENIOR_LEAD,
+				ACCESS_UPP_MEDPREP,
+				ACCESS_UPP_TLPREP,
+				ACCESS_UPP_MACHINEGUN
+			)
+
+
 /proc/get_region_accesses(code)
 	switch(code)
 		if(0)//Everything

code/game/jobs/job/marine/squads.dm

@@ -112,6 +112,8 @@
 	///Should we add the name of our squad in front of their name? Ex: Alpha Hospital Corpsman
 	var/prepend_squad_name_to_assignment = TRUE
 
+	var/squad_one_access = ACCESS_SQUAD_ONE
+	var/squad_two_access = ACCESS_SQUAD_TWO
 
 /datum/squad/marine
 	name = "Root"
@@ -133,12 +135,14 @@
 	name = SQUAD_UPP
 	equipment_color = "#8B0000"
 	chat_color = "#B22222"
-	access = list(ACCESS_MARINE_ALPHA)
+	access = list(ACCESS_UPP_GENERAL)
 	radio_freq = UPP_FREQ
-	minimap_color = MINIMAP_SQUAD_ALPHA
+	minimap_color = MINIMAP_SQUAD_UPP
 	use_stripe_overlay = FALSE
 	usable = TRUE
 	faction = FACTION_UPP
+	squad_one_access = ACCESS_UPP_SQUAD_ONE
+	squad_two_access = ACCESS_UPP_SQUAD_TWO
 
 /datum/squad/marine/upp/New()
 	. = ..()
@@ -764,9 +768,9 @@
 	// I'm not fixing how cursed these strings are, god save us all if someone (or me (https://i.imgur.com/nSy81Bn.png)) has to change these again
 	if(H.wear_id)
 		if(fireteam == "SQ1")
-			H.wear_id.access += ACCESS_SQUAD_ONE
+			H.wear_id.access += squad_one_access
 		if(fireteam == "SQ2")
-			H.wear_id.access += ACCESS_SQUAD_TWO
+			H.wear_id.access += squad_two_access
 
 	for(var/obj/item/device/radio/headset/cycled_headset in H)
 		if(!("Squad Sergeant" in cycled_headset.tracking_options))
@@ -789,7 +793,7 @@
 	H.hud_set_squad()
 
 	if(H.wear_id)
-		H.wear_id.access.Remove(ACCESS_SQUAD_ONE, ACCESS_SQUAD_TWO)
+		H.wear_id.access.Remove(squad_one_access, squad_two_access)
 
 	for(var/obj/item/device/radio/headset/cycled_headset in H)
 		if(!("Platoon Sergeant" in cycled_headset.tracking_options))

code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

@@ -273,7 +273,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_upp_medic, list(
 	name = "\improper UnTech Squad Medical Equipment Rack"
 	desc = "An automated rack hooked up to a colossal storage of hospital corpsman standard-issue equipment."
 	icon_state = "upp_gear"
-	req_access = list(ACCESS_MARINE_MEDPREP)
+	req_access = list(ACCESS_UPP_MEDPREP)
 	vendor_role = list(JOB_SQUAD_MEDIC)
 	vendor_theme = VENDOR_THEME_UPP
 

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

@@ -153,7 +153,7 @@
 	name = "\improper UnTech Surplus Uniform Vendor"
 	desc = "An automated supply rack hooked up to a small storage of standard UPP uniforms."
 	icon_state = "upp_gear"
-	req_access = list(ACCESS_MARINE_PREP)
+	req_access = list(ACCESS_UPP_GENERAL)
 	req_one_access = list()
 	listed_products = list()
 	hackable = TRUE
@@ -381,7 +381,7 @@
 	name = "\improper UnTech Automated Utilities Squad Vendor"
 	desc = "An automated supply rack hooked up to a small storage of various utilities and tools. Can be accessed by any UPP Rifleman."
 	req_access = list()
-	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_SPECPREP, ACCESS_MARINE_RO, ACCESS_MARINE_PREP)
+	req_one_access = list(ACCESS_UPP_GENERAL)
 	hackable = TRUE
 
 	vend_x_offset = 2

code/modules/defenses/sentry.dm

@@ -62,6 +62,8 @@
 
 	can_be_near_defense = TRUE
 
+	var/start_up_message = "Default systems initiated."
+
 	/// Delay sending no ammo messages
 	COOLDOWN_DECLARE(no_ammo_message_cooldown)
 
@@ -237,7 +239,7 @@
 	set_light(luminosity_strength)
 
 	visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] hums to life and emits several beeps.")]")
-	visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] buzzes in a monotone voice: 'Default systems initiated'")]")
+	visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] buzzes in a monotone voice: '[start_up_message]'")]")
 	start_processing()
 	setup_target_acquisition()
 
@@ -767,7 +769,7 @@
 	selected_categories = list(
 		SENTRY_CATEGORY_IFF = FACTION_UPP,
 	)
-
+	start_up_message = "Sentry mounted and loaded. Glory to the UPP."
 
 #undef SENTRY_FIREANGLE
 #undef SENTRY_RANGE

code/modules/gear_presets/uscm.dm

@@ -97,6 +97,7 @@
 /datum/equipment_preset/uscm/pfc/upp
 	name = "UPP Squad Rifleman"
 	paygrade = "UE1"
+	access = list(ACCESS_UPP_GENERAL)
 	assignment = JOB_SQUAD_MARINE_UPP
 	languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
 	faction_group = list(FACTION_UPP)
@@ -147,6 +148,7 @@
 
 /datum/equipment_preset/uscm/sg/upp
 	name = "UPP Squad Machinegunner"
+	access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MACHINEGUN)
 	assignment = JOB_SQUAD_SMARTGUN_UPP
 	paygrade = "UE3"
 	role_comm_title = "MG"
@@ -335,6 +337,7 @@
 /datum/equipment_preset/uscm/medic/upp
 	name = "UPP Sanitar"
 	paygrade = "UE3"
+	access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MEDPREP, ACCESS_UPP_MEDICAL)
 	assignment = JOB_SQUAD_MEDIC_UPP
 	languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
 	faction_group = list(FACTION_UPP)
@@ -382,6 +385,7 @@
 /datum/equipment_preset/uscm/tl/upp
 	name = "UPP Squad Sergeant"
 	paygrade = "UE4"
+	access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_TLPREP)
 	assignment = JOB_SQUAD_TEAM_LEADER_UPP
 	languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
 	faction_group = list(FACTION_UPP)
@@ -462,6 +466,7 @@
 /datum/equipment_preset/uscm/leader/upp
 	name = "UPP Platoon Sergeant"
 	assignment = JOB_SQUAD_LEADER_UPP
+	access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_LEADERSHIP, ACCESS_UPP_FLIGHT)
 	languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
 	paygrade = "UE6"
 	faction_group = list(FACTION_UPP)

code/modules/gear_presets/uscm_ship.dm

@@ -547,10 +547,11 @@
 	skills = /datum/skills/SO
 	minimap_icon = list("cic" = MINIMAP_ICON_COLOR_SILVER)
 	minimap_background = MINIMAP_ICON_BACKGROUND_CIC
+	var/access_list = ACCESS_LIST_MARINE_MAIN
 
 /datum/equipment_preset/uscm_ship/so/New()
 	. = ..()
-	access = get_access(ACCESS_LIST_MARINE_MAIN)
+	access = get_access(access_list)
 
 /datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/satchel
@@ -586,6 +587,7 @@
 	paygrade = "UO2"
 	faction_group = list(FACTION_UPP)
 	faction = FACTION_UPP
+	access_list = ACCESS_LIST_UPP_PLATOON
 
 /datum/equipment_preset/uscm_ship/so/upp/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR)