From f2e21ab267c3160265620a15e7103cef66f2161e Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Wed, 9 Mar 2016 20:43:13 -0800
Subject: [PATCH] Makes everything work

---
 code/controllers/Processes/shuttles/supply.dm | 1 +
 code/game/gamemodes/game_mode.dm              | 2 +-
 code/game/jobs/job_objectives/science.dm      | 4 ++--
 code/game/mecha/mecha_construction_paths.dm   | 8 ++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/code/controllers/Processes/shuttles/supply.dm b/code/controllers/Processes/shuttles/supply.dm
index a1d0af01dd7..e5416d585f1 100644
--- a/code/controllers/Processes/shuttles/supply.dm
+++ b/code/controllers/Processes/shuttles/supply.dm
@@ -174,6 +174,7 @@
 					var/datum/tech/tech = disk.stored
 
 					var/cost = tech.getCost(shuttle_master.techLevels[tech.id])
+					world << "Disk tech: [tech.id], Disk worth: [cost]"
 					if(cost)
 						shuttle_master.techLevels[tech.id] = tech.level
 						shuttle_master.points += cost
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 45fb9284638..447abac00e1 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -120,7 +120,7 @@
 						msg="Task #[count] completed! "
 				if(pay>0)
 					if(M.mind.initial_account)
-						M.mind.initial_account.money += objective.completion_payment
+						M.mind.initial_account.money += pay
 						var/datum/transaction/T = new()
 						T.target_name = "[command_name()] Payroll"
 						T.purpose = "Payment"
diff --git a/code/game/jobs/job_objectives/science.dm b/code/game/jobs/job_objectives/science.dm
index 77867a63304..eb646e6d2b1 100644
--- a/code/game/jobs/job_objectives/science.dm
+++ b/code/game/jobs/job_objectives/science.dm
@@ -5,7 +5,7 @@
 // MAXIMUM SCIENCE
 /datum/job_objective/further_research
 	completion_payment = 50
-	perunit = 1
+	per_unit = 5
 
 /datum/job_objective/further_research/get_description()
 	var/desc = "Research tech levels, and have cargo ship them to centcomm."
@@ -17,7 +17,7 @@
 		if(shuttle_master.techLevels[tech] > 0)
 			return 1
 	return 0
-	
+
 /////////////////////////////////////////////////////////////////////////////////////////
 // Robotics
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 80b883bddd6..08d0541bfb5 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -86,9 +86,6 @@
 
 /datum/construction/mecha/ripley_chassis/spawn_result()
 	var/obj/item/mecha_parts/chassis/const_holder = holder
-	var/datum/job_objective/make_ripley/task = user.mind.findJobTask(/datum/job_objective/make_ripley)
-	if(istype(task))
-		task.unit_completed()
 	const_holder.construct = new /datum/construction/reversible/mecha/ripley(const_holder)
 	const_holder.icon = 'icons/mecha/mech_construction.dmi'
 	const_holder.icon_state = "ripley0"
@@ -100,6 +97,7 @@
 
 /datum/construction/reversible/mecha/ripley
 	result = "/obj/mecha/working/ripley"
+	taskpath = /datum/job_objective/make_ripley
 	steps = list(
 					//1
 					list("key"=/obj/item/weapon/weldingtool,
@@ -578,9 +576,6 @@
 
 /datum/construction/mecha/firefighter_chassis/spawn_result()
 	var/obj/item/mecha_parts/chassis/const_holder = holder
-	var/datum/job_objective/make_ripley/task = user.mind.findJobTask(/datum/job_objective/make_ripley)
-	if(istype(task))
-		task.unit_completed()
 	const_holder.construct = new /datum/construction/reversible/mecha/firefighter(const_holder)
 	const_holder.icon = 'icons/mecha/mech_construction.dmi'
 	const_holder.icon_state = "fireripley0"
@@ -591,6 +586,7 @@
 
 /datum/construction/reversible/mecha/firefighter
 	result = "/obj/mecha/working/ripley/firefighter"
+	taskpath = /datum/job_objective/make_ripley
 	steps = list(
 					//1
 					list("key"=/obj/item/weapon/weldingtool,