[MIRROR] merged skill bonus into jobs, reduced it to 6 on the way

code/game/jobs/job/job.dm

@@ -37,8 +37,7 @@
 
 	var/min_skill = list()				  //Minimum skills allowed for the job. List should contain skill (as in /singleton/hierarchy/skill path), with values which are numbers.
 	var/max_skill = list()				  //Maximum skills allowed for the job.
-	var/skill_points = 16				  //The number of unassigned skill points the job comes with (on top of the minimum skills).
-	var/no_skill_buffs = FALSE			  //Whether skills can be buffed by age/species modifiers.
+	var/skill_points = 22				  //The number of unassigned skill points the job comes with (on top of the minimum skills).
 	var/available_by_default = TRUE
 
 	var/list/possible_goals

code/game/jobs/job/silicon.dm

@@ -14,7 +14,6 @@
 	loadout_allowed = FALSE
 	hud_icon = "hudblank"
 	skill_points = 0
-	no_skill_buffs = TRUE
 	min_skill = list(
 		SKILL_BUREAUCRACY   = SKILL_EXPERIENCED,
 		SKILL_FINANCE       = SKILL_EXPERIENCED,
@@ -63,7 +62,6 @@
 	outfit_type = /singleton/hierarchy/outfit/job/silicon/cyborg
 	hud_icon = "hudblank"
 	skill_points = 0
-	no_skill_buffs = TRUE
 
 /datum/job/cyborg/handle_variant_join(mob/living/carbon/human/H, alt_title)
 	return H && H.Robotize(SSrobots.get_mob_type_by_title(alt_title || title))

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

@@ -88,7 +88,6 @@
 //Sets up skills_allocated
 /datum/preferences/proc/sanitize_skills(list/input)
 	. = list()
-	var/datum/species/S = all_species[species]
 	for(var/job_name in SSjobs.titles_to_datums)
 		var/datum/job/job = SSjobs.get_by_title(job_name)
 		var/input_skills = list()
@@ -109,9 +108,12 @@
 					sum += spent
 
 		points_by_job[job] = job.skill_points							//We compute how many points we had.
+<<<<<<< ours
 		if(!job.no_skill_buffs)
 			points_by_job[job] += S.skills_from_age(age)				//Applies the species-appropriate age modifier.
 			points_by_job[job] += S.job_skill_buffs[job.type]			//Applies the per-job species modifier, if any.
+=======
+>>>>>>> theirs
 
 		if((points_by_job[job] >= sum) && sum)				//we didn't overspend, so use sanitized imported data
 			.[job] = L

code/modules/species/species.dm

@@ -236,8 +236,6 @@
 
 	var/sexybits_location	//organ tag where they are located if they can be kicked for increased pain
 
-	var/job_skill_buffs = list()				// A list containing jobs (/datum/job), with values the extra points that job receives.
-
 	var/list/descriptors = list(
 		/datum/mob_descriptor/height = 0,
 		/datum/mob_descriptor/build = 0

maps/away/scavver/scavver_gantry_jobs.dm

@@ -7,14 +7,14 @@
 	Your weapons are limited; trade, salvage, but avoid conflict as a matter of course."
 	whitelisted_species = list(SPECIES_HUMAN,SPECIES_IPC,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN,SPECIES_MULE)
 	is_semi_antagonist = TRUE
-	min_skill = list(
-		SKILL_HAULING = SKILL_BASIC,
-		SKILL_EVA = SKILL_EXPERIENCED,
-		SKILL_MECH = SKILL_MAX,
-		SKILL_SCIENCE = SKILL_TRAINED,
-		SKILL_PILOT = SKILL_TRAINED,
-		SKILL_COMBAT = SKILL_TRAINED,
-		SKILL_WEAPONS = SKILL_TRAINED
+	min_skill = list( // 27 points
+		SKILL_HAULING = SKILL_BASIC, // 1 point
+		SKILL_EVA = SKILL_EXPERIENCED, // 4 points
+		SKILL_MECH = SKILL_MAX, // 2 points
+		SKILL_SCIENCE = SKILL_TRAINED, // 4 points
+		SKILL_PILOT = SKILL_TRAINED, // 4 points
+		SKILL_COMBAT = SKILL_TRAINED, // 6 points
+		SKILL_WEAPONS = SKILL_TRAINED // 6 points
 	)
 
 	max_skill = list(
@@ -49,13 +49,13 @@
 	info = "You are the doctor aboard your meagre Salvage team. Keep everyone alive. Your weapons are limited; trade, salvage, but avoid conflict as a matter of course."
 	whitelisted_species = list(SPECIES_HUMAN,SPECIES_IPC,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN,SPECIES_MULE)
 	is_semi_antagonist = TRUE
-	min_skill = list(
-		SKILL_HAULING = SKILL_BASIC,
-		SKILL_EVA = SKILL_EXPERIENCED,
-		SKILL_MEDICAL = SKILL_EXPERIENCED,
-		SKILL_ANATOMY = SKILL_EXPERIENCED,
-		SKILL_CHEMISTRY = SKILL_BASIC,
-		SKILL_DEVICES = SKILL_TRAINED
+	min_skill = list( // 45 points
+		SKILL_HAULING = SKILL_BASIC, // 1 point
+		SKILL_EVA = SKILL_EXPERIENCED, // 4 points
+		SKILL_MEDICAL = SKILL_EXPERIENCED, // 16 points
+		SKILL_ANATOMY = SKILL_EXPERIENCED, // 16 points
+		SKILL_CHEMISTRY = SKILL_BASIC, // 4 points
+		SKILL_DEVICES = SKILL_TRAINED // 4 points
 	)
 
 	max_skill = list(
@@ -92,14 +92,14 @@
 	Your weapons are limited; trade, salvage, but avoid conflict as a matter of course."
 	whitelisted_species = list(SPECIES_HUMAN,SPECIES_IPC,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN,SPECIES_MULE)
 	is_semi_antagonist = TRUE
-	min_skill = list(
-		SKILL_HAULING = SKILL_BASIC,
-		SKILL_COMPUTER = SKILL_BASIC,
-		SKILL_EVA = SKILL_EXPERIENCED,
-		SKILL_CONSTRUCTION = SKILL_TRAINED,
-		SKILL_ELECTRICAL = SKILL_BASIC,
-		SKILL_ATMOS = SKILL_BASIC,
-		SKILL_ENGINES = SKILL_BASIC
+	min_skill = list( // 16 points
+		SKILL_HAULING = SKILL_BASIC, // 1 point
+		SKILL_COMPUTER = SKILL_BASIC, // 1 point
+		SKILL_EVA = SKILL_EXPERIENCED, // 4 points
+		SKILL_CONSTRUCTION = SKILL_TRAINED, // 2 points
+		SKILL_ELECTRICAL = SKILL_BASIC, // 2 points
+		SKILL_ATMOS = SKILL_BASIC, // 2 points
+		SKILL_ENGINES = SKILL_BASIC // 4 points
 	)
 
 	max_skill = list(

maps/away/skrellscoutship/skrellscoutship.dm

@@ -70,12 +70,14 @@ var/global/const/access_skrellscoutship = "ACCESS_SKRELLSCOUT"
 	outfit_type = /singleton/hierarchy/outfit/job/skrellscoutship
 	info = "Your vessel is scouting through unknown space, working to map out any potential dangers, as well as potential allies."
 	is_semi_antagonist = TRUE
-	min_skill = list(SKILL_EVA = SKILL_TRAINED,
-					SKILL_PILOT = SKILL_TRAINED,
-					SKILL_HAULING = SKILL_TRAINED,
-					SKILL_COMBAT = SKILL_TRAINED,
-					SKILL_WEAPONS = SKILL_TRAINED,
-					SKILL_MEDICAL = SKILL_BASIC)
+	min_skill = list( // 24 points
+		SKILL_EVA = SKILL_TRAINED, // 2 points
+		SKILL_PILOT = SKILL_TRAINED, // 4 points
+		SKILL_HAULING = SKILL_TRAINED, // 2 points
+		SKILL_COMBAT = SKILL_TRAINED, // 6 points
+		SKILL_WEAPONS = SKILL_TRAINED, // 6 points
+		SKILL_MEDICAL = SKILL_BASIC // 4 points
+	)
 
 /datum/job/submap/skrellscoutship_crew
 	title = "Qrri-Zuumqix"
@@ -90,11 +92,13 @@ var/global/const/access_skrellscoutship = "ACCESS_SKRELLSCOUT"
 	allowed_ranks = list(/datum/mil_rank/skrell_fleet)
 	skill_points = 30
 	is_semi_antagonist = TRUE
-	min_skill = list(SKILL_EVA = SKILL_TRAINED,
-					SKILL_HAULING = SKILL_TRAINED,
-					SKILL_COMBAT = SKILL_TRAINED,
-					SKILL_WEAPONS = SKILL_TRAINED,
-					SKILL_MEDICAL = SKILL_BASIC)
+	min_skill = list( // 20 points
+		SKILL_EVA = SKILL_TRAINED, // 2 points
+		SKILL_HAULING = SKILL_TRAINED, // 2 points
+		SKILL_COMBAT = SKILL_TRAINED, // 6 points
+		SKILL_WEAPONS = SKILL_TRAINED, // 6 points
+		SKILL_MEDICAL = SKILL_BASIC // 4 points
+	)
 
 /datum/job/submap/skrellscoutship_crew/equip(mob/living/carbon/human/H, alt_title, datum/mil_branch/branch, datum/mil_rank/grade)
 	. = ..(H, alt_title, branch, grade)	//passing through arguments

maps/away/voxship/voxship_jobs.dm

@@ -38,13 +38,13 @@
 	info = "You are the sawbones of your scavenger crew. You are in charge of removing stacks, replacing limbs, and generally keeping \
 	your kin alive at all costs."
 	whitelisted_species = list(SPECIES_VOX)
-	min_skill = list(
-		SKILL_HAULING = SKILL_BASIC,
-		SKILL_EVA = SKILL_EXPERIENCED,
-		SKILL_MEDICAL = SKILL_EXPERIENCED,
-		SKILL_ANATOMY = SKILL_EXPERIENCED,
-		SKILL_CHEMISTRY = SKILL_BASIC,
-		SKILL_DEVICES = SKILL_TRAINED
+	min_skill = list( // 45 points
+		SKILL_HAULING = SKILL_BASIC, // 1 point
+		SKILL_EVA = SKILL_EXPERIENCED, // 4 points
+		SKILL_MEDICAL = SKILL_EXPERIENCED, // 16 points
+		SKILL_ANATOMY = SKILL_EXPERIENCED, // 16 points
+		SKILL_CHEMISTRY = SKILL_BASIC, // 4 points
+		SKILL_DEVICES = SKILL_TRAINED // 4 points
 	)
 
 	max_skill = list(
@@ -77,14 +77,14 @@
 	total_positions = 1
 	info = "You are the mechanic of your scavenger crew. Keep all your salvaged technology running, fix robotics, and disassemble some of \
 	the more complex devices your crew comes across."
-	min_skill = list(
-		SKILL_HAULING = SKILL_BASIC,
-		SKILL_COMPUTER = SKILL_BASIC,
-		SKILL_EVA = SKILL_EXPERIENCED,
-		SKILL_CONSTRUCTION = SKILL_TRAINED,
-		SKILL_ELECTRICAL = SKILL_BASIC,
-		SKILL_ATMOS = SKILL_BASIC,
-		SKILL_ENGINES = SKILL_BASIC
+	min_skill = list( // 16 points
+		SKILL_HAULING = SKILL_BASIC, // 1 point
+		SKILL_COMPUTER = SKILL_BASIC, // 1 point
+		SKILL_EVA = SKILL_EXPERIENCED, // 4 points
+		SKILL_CONSTRUCTION = SKILL_TRAINED, // 2 points
+		SKILL_ELECTRICAL = SKILL_BASIC, // 2 points
+		SKILL_ATMOS = SKILL_BASIC, // 2 points
+		SKILL_ENGINES = SKILL_BASIC // 4 points
 	)
 
 	max_skill = list(
@@ -118,13 +118,13 @@
 	outfit_type = /singleton/hierarchy/outfit/job/voxship/crew
 	supervisors = "apex and the arkship"
 	info = "You're in charge. You fly the ship, and dictate what the crew does. Do not disappoint the Apex."
-	min_skill = list(
-		SKILL_HAULING = SKILL_BASIC,
-		SKILL_EVA = SKILL_EXPERIENCED,
-		SKILL_SCIENCE = SKILL_TRAINED,
-		SKILL_PILOT = SKILL_TRAINED,
-		SKILL_COMBAT = SKILL_TRAINED,
-		SKILL_WEAPONS = SKILL_TRAINED
+	min_skill = list( // 25 points
+		SKILL_HAULING = SKILL_BASIC, // 1 point
+		SKILL_EVA = SKILL_EXPERIENCED, // 4 points
+		SKILL_SCIENCE = SKILL_TRAINED, // 4 points
+		SKILL_PILOT = SKILL_TRAINED, // 4 points
+		SKILL_COMBAT = SKILL_TRAINED, // 6 points
+		SKILL_WEAPONS = SKILL_TRAINED // 6 points
 	)
 
 	max_skill = list(