Militsiya update, radio fixes, secret Joe

code/__DEFINES/paygrade_defs/upp.dm

@@ -63,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 Grd"
 //WY Comms
 #define RADIO_CHANNEL_WY "WY"
 #define RADIO_CHANNEL_PMC_GEN "WY PMC"

code/controllers/subsystem/communications.dm

@@ -198,7 +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_KDO = UPP_GRD_FREQ,
+	RADIO_CHANNEL_UPP_GRD = UPP_GRD_FREQ,
 
 	RADIO_CHANNEL_CLF_GEN = CLF_FREQ,
 	RADIO_CHANNEL_CLF_CMD = CLF_CMD_FREQ,
@@ -297,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",

code/datums/paygrades/factions/upp/upp.dm

@@ -141,8 +141,8 @@
 
 //UPP Colonists
 
-/datum/paygrade/upp/constable
-	paygrade = "UC1"
-	name = "Militsya"
+/datum/paygrade/upp/militsiya
+	paygrade = PAY_SHORT_UC1
+	name = "Militsiya"
 	prefix = "Milit."
 	pay_multiplier = 0.3

code/modules/clothing/shoes/marine_shoes.dm

@@ -89,7 +89,6 @@
 /obj/item/clothing/shoes/marine/civilian
 	name = "rugged boots"
 	desc = "A pair of black boots not so dissimilar from military combat boots, a likely culprit for their inspiration. They'll get the job done, whether that's hiking, or kicking in teeth."
-	spawn_item_type = /obj/item/attachable/bayonet
 
 /obj/item/clothing/shoes/marine/civilian/brown
 	icon_state = "marine_brown"
@@ -103,7 +102,6 @@
 	armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_rad = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
-	spawn_item_type = /obj/item/attachable/bayonet
 
 /obj/item/clothing/shoes/marine/mopp
 	name = "\improper M3 MOPP boots"

code/modules/gear_presets/synths.dm

@@ -605,6 +605,8 @@
 	return
 
 /datum/equipment_preset/synth/working_joe/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = null
+	new_human.underwear = null
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) //don't remove shrap by yourself, go to android maintenance or have ARES call a human handler!
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
@@ -632,7 +634,7 @@
 
 /datum/equipment_preset/synth/working_joe/engi
 	name = "Synthetic - Hazmat Joe"
-	joe_type = SYNTH_HAZARD_JOE
+	joe_type = SYNTH_WORKING_JOE
 
 /datum/equipment_preset/synth/working_joe/engi/load_gear(mob/living/carbon/human/new_human)
 	var/choice = rand(1,2)
@@ -683,6 +685,52 @@
 /datum/equipment_preset/synth/working_joe/load_name(mob/living/carbon/human/new_human, randomise)
 	new_human.change_real_name(new_human, "Working Joe #[rand(100)][rand(100)]")
 
+/datum/equipment_preset/synth/working_joe/upp
+	name = "UPP Dzho Automaton"
+	flags = EQUIPMENT_PRESET_EXTRA
+	faction = FACTION_UPP
+	faction_group = list(FACTION_UPP)
+	assignment = "Dzho Automaton"
+
+/datum/equipment_preset/synth/working_joe/upp/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
+	var/random_overalls= rand(1,3)
+	switch(random_overalls)
+		if(1 to 2)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls/tan(new_human), WEAR_JACKET)
+		if(3)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls/red(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/joe(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_JACKET)
+
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/etool(new_human), WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etoolupp/folded(new_human), WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/device/lightreplacer(new_human.back), WEAR_IN_R_STORE)
+
+/datum/equipment_preset/synth/working_joe/upp/load_name(mob/living/carbon/human/new_human, randomise)
+	new_human.change_real_name(new_human, "Dzho Automaton #[rand(100)][rand(100)]")
+
+/datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human)
+	. = ..()
+	new_human.set_species(joe_type)
+	new_human.h_style = "Bald"
+	new_human.f_style = "Shaved"
+	if(prob(25))
+		new_human.grad_style = "None" //No gradients for Working Joes
+		new_human.h_style = "Shoulder-length Hair" //Added the chance of hair as per Monkeyfist lore accuracy
+	new_human.r_eyes = 0
+	new_human.g_eyes = 0
+	new_human.b_eyes = 0
+	new_human.r_hair = 100
+	new_human.g_hair = 88
+	new_human.b_hair = 74
+	new_human.r_facial = 255
+	new_human.g_facial = 255
+	new_human.b_facial = 255
+
 //*****************************************************************************************************/
 
 /datum/equipment_preset/synth/survivor/cultist_synth

code/modules/gear_presets/upp.dm

@@ -896,9 +896,9 @@
 	flags = EQUIPMENT_PRESET_EXTRA
 	skills = /datum/skills/cmb
 	assignment = "People's Police Militsiya"
+	paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "MILTSY"
 	access = list(ACCESS_UPP_SECURITY, ACCESS_UPP_GENERAL)
-	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
 	idtype = /obj/item/card/id/silver
 
 /datum/equipment_preset/upp/police/load_gear(mob/living/carbon/human/new_human)

code/modules/mob/living/carbon/human/species/working_joe/_species.dm

@@ -16,7 +16,7 @@
 /datum/species/synthetic/colonial/working_joe/hazard
 	name = SYNTH_HAZARD_JOE //TECHNICALLY the proper name would be Hazard Working Joes, but we will stick with Hazard Joe for now
 	name_plural = "Hazard Joes"
-	emote_panel_type = /datum/joe_emote_panel/hazard
+	emote_panel_type = /datum/joe_emote_panel
 
 /datum/species/synthetic/colonial/working_joe/handle_post_spawn(mob/living/carbon/human/joe)
 	. = ..()

maps/map_files/chapaev/chapaev.dmm

@@ -2469,7 +2469,9 @@
 /turf/closed/wall/strata_outpost/reinforced,
 /area/golden_arrow/engineering)
 "vc" = (
-/obj/structure/machinery/power/apc/almayer/south,
+/obj/structure/machinery/power/apc/almayer/south{
+	layer = 5
+	},
 /turf/open/floor/strata/floor3/east,
 /area/golden_arrow/cryo_cells)
 "vp" = (
@@ -5285,7 +5287,9 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
 	},
-/obj/structure/machinery/power/apc/almayer/south,
+/obj/structure/machinery/power/apc/almayer/south{
+	layer = 5
+	},
 /turf/open/floor/strata/floor2,
 /area/golden_arrow/briefing)
 "YU" = (