Merge remote-tracking branch 'cmss13-devs/master' into royalmarines

# Conflicts:
#	code/modules/clothing/under/ties.dm
#	icons/obj/items/clothing/ties.dmi
#	icons/turf/ert_shuttle.dmi

code/__DEFINES/language.dm

@@ -20,6 +20,8 @@
 
 #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)
+
 //Chinese language sound bitflags
 
 //initial flags

code/__DEFINES/minimap.dm

@@ -4,7 +4,8 @@
 #define MINIMAP_FLAG_PMC (1<<2)
 #define MINIMAP_FLAG_UPP (1<<3)
 #define MINIMAP_FLAG_CLF (1<<4)
-#define MINIMAP_FLAG_ALL (1<<5) - 1
+#define MINIMAP_FLAG_YAUTJA (1<<5)
+#define MINIMAP_FLAG_ALL (1<<6) - 1
 
 ///Converts the overworld x and y to minimap x and y values
 #define MINIMAP_SCALE 2

code/__DEFINES/mode.dm

@@ -70,6 +70,7 @@
 #define MODE_LZ_PROTECTION (1<<7) /// Prevents the LZ from being mortared
 #define MODE_SHIPSIDE_SD (1<<8) /// Toggles whether Predators can big SD when not on the groundmap
 #define MODE_HARDCORE_PERMA (1<<9) /// Toggles Hardcore for all marines, meaning they instantly perma upon death
+#define MODE_DISPOSABLE_MOBS (1<<10) // Toggles if mobs fit in disposals or not. Off by default.
 
 #define ROUNDSTATUS_FOG_DOWN 1
 #define ROUNDSTATUS_PODDOORS_OPEN 2

code/__HELPERS/logging.dm

@@ -108,8 +108,10 @@
 	if (CONFIG_GET(flag/log_interact))
 		WRITE_LOG(GLOB.world_game_log, "INTERACT: [msg]")
 		LOG_REDIS("interact", "\[[time]\] [msg]")
-	origin.attack_log += "\[[time]\]<font color='green'> [msg] </font>"
-	target.attack_log += "\[[time]\]<font color='green'> [msg] </font>"
+	if(origin)
+		origin.attack_log += "\[[time]\]<font color='green'> [msg] </font>"
+	if(target)
+		target.attack_log += "\[[time]\]<font color='green'> [msg] </font>"
 
 	GLOB.STUI.attack.Add("\[[time]]INTERACT: [msg]")
 	GLOB.STUI.processing |= STUI_LOG_ATTACK

code/_globalvars/bitfields.dm

@@ -415,6 +415,7 @@ DEFINE_BITFIELD(toggleable_flags, list(
 	"MODE_NO_COMBAT_CAS" = MODE_NO_COMBAT_CAS,
 	"MODE_LZ_PROTECTION" = MODE_LZ_PROTECTION,
 	"MODE_SHIPSIDE_SD" = MODE_SHIPSIDE_SD,
+	"MODE_DISPOSABLE_MOBS" = MODE_DISPOSABLE_MOBS,
 ))
 
 DEFINE_BITFIELD(state, list(

code/_globalvars/lists/mapping_globals.dm

@@ -27,6 +27,7 @@ GLOBAL_LIST_EMPTY(latewhiskey)
 
 GLOBAL_LIST_EMPTY(latejoin)
 GLOBAL_LIST_EMPTY(latejoin_by_squad)
+GLOBAL_LIST_EMPTY(latejoin_by_job)
 
 GLOBAL_LIST_EMPTY(zombie_landmarks)
 

code/datums/emergency_calls/cryo_marines.dm

@@ -36,30 +36,35 @@
 	if(leaders < cryo_squad.max_leaders && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job))
 		leader = H
 		leaders++
-		arm_equipment(H, /datum/equipment_preset/uscm/leader/cryo, TRUE, TRUE)
+		H.client.prefs.copy_all_to(H, JOB_SQUAD_LEADER, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/uscm/leader/cryo, FALSE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are a Squad Leader in the USCM"))
 		to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
 		to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else if (heavies < max_heavies && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(H.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
 		heavies++
-		arm_equipment(H, /datum/equipment_preset/uscm/spec/cryo, TRUE, TRUE)
+		H.client.prefs.copy_all_to(H, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/uscm/spec/cryo, FALSE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are a Weapons Specialist in the USCM"))
 		to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
 		to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else if (medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job))
 		medics++
-		arm_equipment(H, /datum/equipment_preset/uscm/medic/cryo, TRUE, TRUE)
+		H.client.prefs.copy_all_to(H, JOB_SQUAD_MEDIC, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/uscm/medic/cryo, FALSE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are a Hospital Corpsman in the USCM"))
 		to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
 		to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else if (engineers < max_engineers && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(H.client, JOB_SQUAD_ENGI, time_required_for_job))
 		engineers++
-		arm_equipment(H, /datum/equipment_preset/uscm/engineer/cryo, TRUE, TRUE)
+		H.client.prefs.copy_all_to(H, JOB_SQUAD_ENGI, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/uscm/engineer/cryo, FALSE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are an Engineer in the USCM"))
 		to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
 		to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
 	else
-		arm_equipment(H, /datum/equipment_preset/uscm/pfc/cryo, TRUE, TRUE)
+		H.client.prefs.copy_all_to(H, JOB_SQUAD_MARINE, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/uscm/pfc/cryo, FALSE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are a Rifleman in the USCM"))
 		to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
 		to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))

code/datums/skills.dm

@@ -1594,6 +1594,82 @@ COLONIAL MARSHALS
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
 		SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER
 	)
+
+/datum/skills/military/survivor/upp_private
+	name = "UPP Private"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_CQC = SKILL_CQC_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+	)
+
+/datum/skills/military/survivor/upp_sapper
+	name = "UPP Sapper"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_CQC = SKILL_CQC_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+	)
+
+/datum/skills/military/survivor/upp_medic
+	name = "UPP Medic"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
+		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_CQC = SKILL_CQC_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+	)
+
+/datum/skills/military/survivor/upp_spec
+	name = "UPP Specialist"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_CQC = SKILL_CQC_TRAINED,
+		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_CQC = SKILL_CQC_TRAINED,
+		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+	)
+
+/datum/skills/military/survivor/upp_sl
+	name = "UPP Squad Leader"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_CQC = SKILL_CQC_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,
+		SKILL_JTAC = SKILL_JTAC_EXPERT,
+	)
+
 /*
 ---------------------
 SPEC-OPS

code/datums/statistics/entities/death_stats.dm

@@ -65,13 +65,25 @@
 	)
 
 /mob/proc/track_mob_death(datum/cause_data/cause_data, turf/death_loc)
-	if(!mind || statistic_exempt)
-		return
-
 	if(cause_data && !istype(cause_data))
 		stack_trace("track_mob_death called with string cause ([cause_data]) instead of datum")
 		cause_data = create_cause_data(cause_data)
 
+	var/log_message = "\[[time_stamp()]\] [key_name(src)] died to "
+	if(cause_data)
+		log_message += "[cause_data.cause_name]"
+	else
+		log_message += "unknown causes"
+	var/mob/cause_mob = cause_data?.resolve_mob()
+	if(cause_mob)
+		log_message += " from [key_name(cause_data.resolve_mob())]"
+		cause_mob.attack_log += "\[[time_stamp()]\] [key_name(cause_mob)] killed [key_name(src)] with [cause_data.cause_name]."
+
+	attack_log += "[log_message]."
+
+	if(!mind || statistic_exempt)
+		return
+
 	var/datum/entity/statistic/death/new_death = DB_ENTITY(/datum/entity/statistic/death)
 	var/datum/entity/player/player_entity = get_player_from_key(mind.ckey)
 	if(player_entity)
@@ -96,7 +108,6 @@
 	new_death.cause_role_name = cause_data?.role
 	new_death.cause_faction_name = cause_data?.faction
 
-	var/mob/cause_mob = cause_data?.resolve_mob()
 	if(cause_mob)
 		cause_mob.life_kills_total += life_value
 

code/game/gamemodes/colonialmarines/colonialmarines.dm

@@ -372,11 +372,11 @@
 				var/headcount = count_per_faction()
 				var/living = headcount["total_headcount"]
 				if ((headcount["WY_headcount"] / living) > MAJORITY)
-					musical_track = pick('sound/theme/LastManStanding_WY.ogg')
+					musical_track = pick('sound/theme/lastmanstanding_wy.ogg')
 				else if ((headcount["UPP_headcount"] / living) > MAJORITY)
-					musical_track = pick('sound/theme/LastManStanding_UPP.ogg')
+					musical_track = pick('sound/theme/lastmanstanding_upp.ogg')
 				else if ((headcount["CLF_headcount"] / living) > MAJORITY)
-					musical_track = pick('sound/theme/LastManStanding_CLF.ogg')
+					musical_track = pick('sound/theme/lastmanstanding_clf.ogg')
 				else if ((headcount["marine_headcount"] / living) > MAJORITY)
 					musical_track = pick('sound/theme/neutral_melancholy2.ogg') //This is the theme song for Colonial Marines the game, fitting
 			else

code/game/jobs/job/job.dm

@@ -288,6 +288,8 @@
 			join_turf = get_turf(pick(GLOB.spawns_by_job[type]))
 		else if(assigned_squad && GLOB.latejoin_by_squad[assigned_squad])
 			join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
+		else if(GLOB.latejoin_by_job[title])
+			join_turf = get_turf(pick(GLOB.latejoin_by_job[title]))
 		else
 			join_turf = get_turf(pick(GLOB.latejoin))
 		human.forceMove(join_turf)

code/game/jobs/role_authority.dm

@@ -553,6 +553,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 		var/turf/late_join_turf
 		if(GLOB.latejoin_by_squad[assigned_squad])
 			late_join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
+		else if(GLOB.latejoin_by_job[J.title])
+			late_join_turf = get_turf(pick(GLOB.latejoin_by_job[J.title]))
 		else
 			late_join_turf = get_turf(pick(GLOB.latejoin))
 		H.forceMove(late_join_turf)