Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Caps Softcap for Rad Collector Attempt 2 - Making 115k Credits per collector is NOT intended. #17495

Merged
merged 2 commits into from
Jan 17, 2023
Merged

Caps Softcap for Rad Collector Attempt 2 - Making 115k Credits per collector is NOT intended. #17495

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09d2c76
Update collector.dm
JamieD1 Jan 15, 2023
caea64d
Update collector.dm
ToasterBiome Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/modules/power/singularity/collector.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
// Higher power bonus will give more power
var/power_bonus = 0
// Balance amount of money given to crew
var/balancevalue = 0.05
var/creditpayout = 0

var/obj/item/radio/radio
var/obj/item/tank/internals/plasma/loaded_tank = null
Expand Down Expand Up @@ -106,9 +106,9 @@
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
var/payout = output/8000
stored_power -= min(payout*200, stored_power)
payout = payout * balancevalue
D.adjust_money(payout)
stored_power -= min(payout*20000, stored_power)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wuat does this change do

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wuat does this change do

Puts it back to how it was before I touched it

creditpayout= clamp(payout, 0, 1200)
D.adjust_money(creditpayout)
last_output = payout

/obj/machinery/power/rad_collector/interact(mob/user)
Expand Down Expand Up @@ -267,7 +267,7 @@
else if(mode == SCIENCE)
. += "<span class='notice'>[src]'s display states that it has stored a total of <b>[stored_power*RAD_COLLECTOR_MINING_CONVERSION_RATE]</b>, and producing [last_output*60] research points per minute.</span>"
else if(mode == MONEY)
. += "<span class='notice'>[src]'s display states that it has stored a total of <b>[stored_power*RAD_COLLECTOR_MINING_CONVERSION_RATE] credits</b>, and producing [last_output*60] credits per minute.</span>"
. += "<span class='notice'>[src]'s display states that it has stored a total of <b>[stored_power*RAD_COLLECTOR_MINING_CONVERSION_RATE] credits</b>, and producing [creditpayout] credits per minute.</span>"
else
if(mode == POWER)
. += "<span class='notice'><b>[src]'s display displays the words:</b> \"Power production mode. Please insert <b>Plasma</b>. Use a multitool to change production modes.\"</span>"
Expand Down