shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448

Browse Source 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
This commit is contained in:
LetterJay
2018-05-24 11:58:57 -05:00
committed by GitHub
parent 8860b57b33 d19ecc5a4f
commit b89254ced7
15 changed files with 307 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/collector.dm
+1 -1
View File
@@ -66,7 +66,7 @@
loaded_tank.air_contents.gases[/datum/gas/carbon_dioxide][MOLES] += gasdrained*2
loaded_tank.air_contents.garbage_collect()
var/bitcoins_mined = min(last_power, (last_power*RAD_COLLECTOR_STORED_OUT)+1000)
SSresearch.science_tech.research_points += bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE
SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE)
last_power-=bitcoins_mined
/obj/machinery/power/rad_collector/attack_hand(mob/user)