Skip to content

Commit

Permalink
Fixed not being able to sell research disks, and being able to re-sel…
Browse files Browse the repository at this point in the history
…l disks by sending low-tech disks to reset the levels
  • Loading branch information
Cruix committed May 13, 2017
1 parent 7009887 commit fa4a54c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion code/modules/cargo/exports/research.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
if(!V)
continue
var/datum/tech/tech = V
techLevels[tech.id] = tech.level
techLevels[tech.id] = max(techLevels[tech.id], tech.level)
5 changes: 0 additions & 5 deletions code/modules/research/research.dm
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ research holder datum.
var/level = 1 //A simple number scale of the research level. Level 0 = Secret tech.
var/rare = 1 //How much CentCom wants to get that tech. Used in supply shuttle tech cost calculation.
var/list/req_tech = list() //List of ids associated values of techs required to research this tech. "id" = #
var/exported_level = 0


//Trunk Technologies (don't require any other techs and you start knowning them).
Expand Down Expand Up @@ -307,10 +306,6 @@ research holder datum.

if(current_level >= level)
return 0

if(exported_level == level)
return 0
exported_level = level

var/cost = 0
for(var/i=current_level+1, i<=level, i++)
Expand Down

0 comments on commit fa4a54c

Please sign in to comment.