Merge remote-tracking branch 'Meghan-Rossi/master' into job_description_alt

code/modules/client/preference_setup/general/04_equipment.dm

@@ -40,7 +40,7 @@
 		pref.backbag = 1 //Same as above
 	character.backbag = pref.backbag
 
-	if(pref.pdachoice > 4 || pref.pdachoice < 1)
+	if(pref.pdachoice > 5 || pref.pdachoice < 1)
 		pref.pdachoice = 1
 	character.pdachoice = pref.pdachoice
 

code/modules/client/preference_setup/global/setting_datums.dm

@@ -110,11 +110,11 @@ var/list/_client_preferences_by_type
 	enabled_description = "Show"
 	disabled_description = "Hide"
 
-/datum/client_preference/air_pump_noise 
-	description ="Air Pump Ambient Noise" 
-	key = "SOUND_AIRPUMP" 
-	enabled_description = "Audible" 
-	disabled_description = "Silent" 
+/datum/client_preference/air_pump_noise
+	description ="Air Pump Ambient Noise"
+	key = "SOUND_AIRPUMP"
+	enabled_description = "Audible"
+	disabled_description = "Silent"
 
 /datum/client_preference/mob_tooltips
 	description ="Mob tooltips"
@@ -128,6 +128,12 @@ var/list/_client_preferences_by_type
 	enabled_description = "Show"
 	disabled_description = "Hide"
 
+/datum/client_preference/precision_placement
+	description ="Precision Placement"
+	key = "PRECISE_PLACEMENT"
+	enabled_description = "Active"
+	disabled_description = "Inactive"
+
 /datum/client_preference/hotkeys_default
 	description ="Hotkeys Default"
 	key = "HUD_HOTKEYS"

code/modules/client/preference_setup/loadout/loadout.dm

@@ -257,12 +257,12 @@ var/list/gear_datums = list()
 
 /datum/gear/proc/spawn_item(var/location, var/metadata)
 	var/datum/gear_data/gd = new(path, location)
-	for(var/datum/gear_tweak/gt in gear_tweaks)
-		if(gear_tweaks.len)
+	if(length(gear_tweaks) && metadata)
+		for(var/datum/gear_tweak/gt in gear_tweaks)
 			gt.tweak_gear_data(metadata["[gt]"], gd)
 	var/item = new gd.path(gd.location)
-	for(var/datum/gear_tweak/gt in gear_tweaks)
-		if(gear_tweaks.len)
+	if(length(gear_tweaks) && metadata)
+		for(var/datum/gear_tweak/gt in gear_tweaks)
 			gt.tweak_item(item, metadata["[gt]"])
 	var/mob/M = location
 	if(istype(M) && exploitable) //Update exploitable info records for the mob without creating a duplicate object at their feet.

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -204,7 +204,7 @@
 
 /datum/gear/uniform/dept/undercoat/mining
 	display_name = "mining undercoat (Teshari)"
-	path = /obj/item/clothing/accessory/poncho/roles/cloak/mining
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/mining
 	allowed_roles = list("Quartermaster","Shaft Miner")
 
 /datum/gear/uniform/dept/undercoat/security

code/modules/client/preference_setup/occupation/occupation.dm

@@ -99,7 +99,7 @@
 		if((pref.job_civilian_low & ASSISTANT) && job.type != /datum/job/assistant)
 			. += "<font color=grey>[rank]</font></a></td><td></td></tr>"
 			continue
-		if((rank in command_positions) || (rank == "AI"))//Bold head jobs
+		if((rank in SSjob.get_job_titles_in_department(DEPARTMENT_COMMAND) ) || (rank == "AI"))//Bold head jobs
 			. += "<b>[rank]</b></a>"
 		else
 			. += "[rank]</a>"