From e708cfc4dcf294305c048f85d7145aa3e612e84e Mon Sep 17 00:00:00 2001 From: Theos Date: Thu, 18 Apr 2024 23:51:18 -0400 Subject: [PATCH] Removes default type space cash spawns from tesla coils & rad collectors (#2884) ## About The Pull Request These cant be added to cards or helm consoles and have a default sprite ## Why It's Good For The Game Actually fixing this would require a rebalance of the output since its both passively farmable and quite large. I'm not against it but I dont think anyone is particularly for it either ## Changelog :cl: del: tesla coils and rad collectors can no longer print monopoly money /:cl: --------- Signed-off-by: Theos --- code/modules/power/singularity/collector.dm | 1 - code/modules/power/tesla/coil.dm | 2 -- 2 files changed, 3 deletions(-) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 8850c4e68981..a5d8b4c4e1e9 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -70,7 +70,6 @@ loaded_tank.air_contents.adjust_moles(GAS_O2, -gasdrained) loaded_tank.air_contents.adjust_moles(GAS_CO2, gasdrained*2) var/bitcoins_mined = RAD_COLLECTOR_OUTPUT - new /obj/item/spacecash(get_dumping_location(), bitcoins_mined * RAD_COLLECTOR_MINING_CONVERSION_RATE) stored_research += bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE*PRIVATE_TECHWEB_GAIN linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE*PUBLIC_TECHWEB_GAIN) stored_energy-=bitcoins_mined diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index ccbb774f0224..7f6ca0f5d360 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -96,7 +96,6 @@ var/power_produced = powernet ? power / power_loss : power add_avail(power_produced*input_power_multiplier) flick("coilhit", src) - new /obj/item/spacecash(get_dumping_location(), power_produced) if(istype(linked_techweb) && (zap_flags & ZAP_GIVES_RESEARCH) && can_generate_research) linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 3)) // x4 coils = 12 points a shock for RND, if they even bothered to link the server. addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10) @@ -133,7 +132,6 @@ var/power_produced = powernet ? power / power_loss : power add_avail(power_produced*input_power_multiplier) flick("rpcoilhit", src) - new /obj/item/spacecash(get_dumping_location(), min(power_produced, 12)) if(istype(linked_techweb) && (zap_flags & ZAP_GIVES_RESEARCH)) linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 25)) // x4 coils = 100 points per shock, which is a good reward for building a research tesla or electrical storm harvest ship addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)