Arconomy: The bigger balance PR (REVISED EDITION)

code/__DEFINES/dcs/signals/signals_revolution.dm

@@ -0,0 +1,4 @@
+/// Revolution signals
+
+///Called when the crew wins the revolution onto machines with the payment component associated with the LATHE_TAX define. No arguments.
+#define COMSIG_REVOLUTION_TAX_REMOVAL "revs_tax_removal"

code/datums/components/payment.dm

@@ -33,6 +33,7 @@
 	transaction_style = _style
 	RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE, .proc/attempt_charge)
 	RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE_CHANGE, .proc/change_cost)
+	RegisterSignal(parent, COMSIG_REVOLUTION_TAX_REMOVAL, .proc/clean_up)
 
 /datum/component/payment/proc/attempt_charge(datum/source, atom/movable/target, extra_fees = 0)
 	SIGNAL_HANDLER
@@ -153,12 +154,16 @@
 	log_econ("[total_cost] credits were spent on [parent] by [user] via [idcard.registered_account.account_holder]'s card.")
 	idcard.registered_account.bank_card_talk("[total_cost] credits deducted from your account.")
 	playsound(src, 'sound/effects/cashregister.ogg', 20, TRUE)
-	SSeconomy.track_purchase(card.registered_account, cost + extra_fees, parent)
+	SSeconomy.track_purchase(idcard.registered_account, total_cost, parent)
 	return TRUE
 
-
-/datum/component/payment/proc/change_cost(datum/source, new_cost)
+/**
+ * Attempts to remove the payment component, currently when the crew wins a revolution.
+ * * datum/source: source of the signal.
+ */
+/datum/component/payment/proc/clean_up(datum/source)
 	SIGNAL_HANDLER
-	if(!isnum(new_cost))
-		CRASH("change_cost called with variable new_cost as not a number.")
-	cost = new_cost
+	target_acc = null
+	qdel(src)
+	return
+

code/modules/antagonists/revolution/revolution.dm

@@ -456,7 +456,7 @@
 				\"Please stand by for a message from your benefactor. Message as follows, provocateur. \
 				<b>You have been chosen out of your fellow provocateurs to rename the station. Choose wisely.</b> Message ends.\""))
 		for (var/obj/machinery/taxed_machine as anything in GLOB.production_machines)
-			qdel(taxed_machine.GetComponent(/datum/component/payment))
+			SEND_SIGNAL(taxed_machine, COMSIG_REVOLUTION_TAX_REMOVAL)
 
 		for (var/mob/living/player as anything in GLOB.player_list)
 			var/datum/mind/player_mind = player.mind

tgstation.dme

@@ -235,6 +235,7 @@
 #include "code\__DEFINES\dcs\signals\signals_radiation.dm"
 #include "code\__DEFINES\dcs\signals\signals_reagent.dm"
 #include "code\__DEFINES\dcs\signals\signals_restaurant.dm"
+#include "code\__DEFINES\dcs\signals\signals_revolution.dm"
 #include "code\__DEFINES\dcs\signals\signals_scangate.dm"
 #include "code\__DEFINES\dcs\signals\signals_screentips.dm"
 #include "code\__DEFINES\dcs\signals\signals_spatial_grid.dm"