mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 10:03:50 +01:00
Fixes the RIPLEY objective, and changes R&D's objective
to ship disks to cargo
This commit is contained in:
@@ -177,6 +177,10 @@
|
||||
if(cost)
|
||||
shuttle_master.techLevels[tech.id] = tech.level
|
||||
shuttle_master.points += cost
|
||||
for(var/mob/M in player_list)
|
||||
if(M.mind)
|
||||
for(var/datum/job_objective/further_research/objective in M.mind.job_objectives)
|
||||
objective.unit_completed(cost)
|
||||
msg += "<span class='good'>+[cost]</span>: [tech.name] - new data.<br>"
|
||||
|
||||
// Sell max reliablity designs
|
||||
|
||||
@@ -3,32 +3,20 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// MAXIMUM SCIENCE
|
||||
/datum/job_objective/maximize_research
|
||||
completion_payment = 1000
|
||||
/datum/job_objective/further_research
|
||||
completion_payment = 50
|
||||
perunit = 1
|
||||
|
||||
/datum/job_objective/maximize_research/get_description()
|
||||
var/desc = "Maximize all legal research tech levels."
|
||||
/datum/job_objective/further_research/get_description()
|
||||
var/desc = "Research tech levels, and have cargo ship them to centcomm."
|
||||
return desc
|
||||
|
||||
/datum/job_objective/maximize_research/check_for_completion()
|
||||
var/obj/machinery/r_n_d/server/server = null
|
||||
for(var/obj/machinery/r_n_d/server/serber in machines)
|
||||
if(serber.name == "Core R&D Server")
|
||||
server = serber
|
||||
break
|
||||
if(!server)
|
||||
return 0
|
||||
|
||||
for(var/datum/tech/T in server.files.possible_tech)
|
||||
if(T.max_level==0) // Ignore illegal tech, etc
|
||||
continue
|
||||
var/datum/tech/KT = locate(T.type, server.files.known_tech)
|
||||
if(!KT)
|
||||
return 0 // Obviously haven't maxed everything if we don't know a tech.
|
||||
if(KT.level<T.max_level)
|
||||
return 0
|
||||
return 1
|
||||
|
||||
for(var/tech in shuttle_master.techLevels)
|
||||
if(shuttle_master.techLevels[tech] > 0)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Robotics
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -86,6 +86,9 @@
|
||||
|
||||
/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"
|
||||
@@ -575,6 +578,9 @@
|
||||
|
||||
/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"
|
||||
|
||||
Reference in New Issue
Block a user