From 94414218fe5ae1d64f38e23cfacfcc95a283eea4 Mon Sep 17 00:00:00 2001 From: MelokGleb <99420088+MelokGleb@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:07:49 +0300 Subject: [PATCH 1/5] bit + final --- modular_meta/features/metacoins/code/metacoin.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modular_meta/features/metacoins/code/metacoin.dm b/modular_meta/features/metacoins/code/metacoin.dm index 25f12ca19e0a..fc988090ec26 100644 --- a/modular_meta/features/metacoins/code/metacoin.dm +++ b/modular_meta/features/metacoins/code/metacoin.dm @@ -3,7 +3,7 @@ #define METACOIN_REWARD_SURVIVE_EVAC 25 #define METACOIN_REWARD_IMPORTANT_JOBS 50 #define METACOIN_REWARD_ANTAG_GREENTEXT 50 -#define METACOIN_IMPORTANT_JOBS list(JOB_SHAFT_MINER, JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER_SUPPLY, JOB_SECURITY_OFFICER_SCIENCE, JOB_SECURITY_OFFICER_ENGINEERING, JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_CHIEF_MEDICAL_OFFICER, JOB_DETECTIVE, JOB_CHIEF_ENGINEER ) // THIS SHALL BE IN CONFIG, BUT I'M VERY LAZY, OKAY? +#define METACOIN_IMPORTANT_JOBS list(JOB_SHAFT_MINER, JOB_BITRUNNER, JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER_SUPPLY, JOB_SECURITY_OFFICER_SCIENCE, JOB_SECURITY_OFFICER_ENGINEERING, JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_CHIEF_MEDICAL_OFFICER, JOB_DETECTIVE, JOB_CHIEF_ENGINEER ) // THIS SHALL BE IN CONFIG, BUT I'M VERY LAZY, OKAY? #define METACOIN_ICON_PATH "icons/obj/economy.dmi" #define METACOIN_ICON_STATE "coin_tails" // someone get us a nice lil' carp_coin sprite, or "masscoin" @@ -306,6 +306,12 @@ GLOBAL_DATUM(metacoins_controller, /datum/metacoins_controller) if(!length(antag_datum.objectives)) return TRUE + if(antag_datum == /datum/antagonist/traitor) + var/datum/antagonist/traitor/traitor_datum = antag_datum + var/datum/uplink_handler/handler = traitor_datum.uplink_handler + if(handler.final_objective) + return TRUE + for(var/datum/objective/objective as anything in antag_datum.objectives) if(!objective.check_completion()) return FALSE From ac8dfde039d654493070bf0b26810086bf795f30 Mon Sep 17 00:00:00 2001 From: MelokGleb <99420088+MelokGleb@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:19:52 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=B1=D0=BB=D1=8F))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_meta/features/metacoins/code/metacoin.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_meta/features/metacoins/code/metacoin.dm b/modular_meta/features/metacoins/code/metacoin.dm index fc988090ec26..fd8777d097d3 100644 --- a/modular_meta/features/metacoins/code/metacoin.dm +++ b/modular_meta/features/metacoins/code/metacoin.dm @@ -306,7 +306,7 @@ GLOBAL_DATUM(metacoins_controller, /datum/metacoins_controller) if(!length(antag_datum.objectives)) return TRUE - if(antag_datum == /datum/antagonist/traitor) + if(istype(antag_datum, /datum/antagonist/traitor) var/datum/antagonist/traitor/traitor_datum = antag_datum var/datum/uplink_handler/handler = traitor_datum.uplink_handler if(handler.final_objective) From c9cc1cf1a8dec41df51eaf7b3439d19c640dac85 Mon Sep 17 00:00:00 2001 From: MelokGleb <99420088+MelokGleb@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:20:27 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=B1=D0=BB=D1=8F))=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_meta/features/metacoins/code/metacoin.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_meta/features/metacoins/code/metacoin.dm b/modular_meta/features/metacoins/code/metacoin.dm index fd8777d097d3..269edf4f2f58 100644 --- a/modular_meta/features/metacoins/code/metacoin.dm +++ b/modular_meta/features/metacoins/code/metacoin.dm @@ -309,7 +309,7 @@ GLOBAL_DATUM(metacoins_controller, /datum/metacoins_controller) if(istype(antag_datum, /datum/antagonist/traitor) var/datum/antagonist/traitor/traitor_datum = antag_datum var/datum/uplink_handler/handler = traitor_datum.uplink_handler - if(handler.final_objective) + if(handler?.final_objective) return TRUE for(var/datum/objective/objective as anything in antag_datum.objectives) From fcd986f92fabb76bc9819cfc73708b7ca586c059 Mon Sep 17 00:00:00 2001 From: MelokGleb <99420088+MelokGleb@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:21:05 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=B1=D0=BB=D1=8F))=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_meta/features/metacoins/code/metacoin.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_meta/features/metacoins/code/metacoin.dm b/modular_meta/features/metacoins/code/metacoin.dm index 269edf4f2f58..f474101d8802 100644 --- a/modular_meta/features/metacoins/code/metacoin.dm +++ b/modular_meta/features/metacoins/code/metacoin.dm @@ -306,7 +306,7 @@ GLOBAL_DATUM(metacoins_controller, /datum/metacoins_controller) if(!length(antag_datum.objectives)) return TRUE - if(istype(antag_datum, /datum/antagonist/traitor) + if(istype(antag_datum, /datum/antagonist/traitor)) var/datum/antagonist/traitor/traitor_datum = antag_datum var/datum/uplink_handler/handler = traitor_datum.uplink_handler if(handler?.final_objective) From c889dc22f519512e791c10a073d0b2530224ee67 Mon Sep 17 00:00:00 2001 From: MelokGleb <99420088+MelokGleb@users.noreply.github.com> Date: Sun, 16 Aug 2026 00:36:49 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BD=D0=B0=D1=85=D1=83=D0=B9=20=D1=88?= =?UTF-8?q?=D0=B0=D1=85=D1=82=D1=91=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_meta/features/metacoins/code/metacoin.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_meta/features/metacoins/code/metacoin.dm b/modular_meta/features/metacoins/code/metacoin.dm index f474101d8802..1d7a2feff4ea 100644 --- a/modular_meta/features/metacoins/code/metacoin.dm +++ b/modular_meta/features/metacoins/code/metacoin.dm @@ -3,7 +3,7 @@ #define METACOIN_REWARD_SURVIVE_EVAC 25 #define METACOIN_REWARD_IMPORTANT_JOBS 50 #define METACOIN_REWARD_ANTAG_GREENTEXT 50 -#define METACOIN_IMPORTANT_JOBS list(JOB_SHAFT_MINER, JOB_BITRUNNER, JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER_SUPPLY, JOB_SECURITY_OFFICER_SCIENCE, JOB_SECURITY_OFFICER_ENGINEERING, JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_CHIEF_MEDICAL_OFFICER, JOB_DETECTIVE, JOB_CHIEF_ENGINEER ) // THIS SHALL BE IN CONFIG, BUT I'M VERY LAZY, OKAY? +#define METACOIN_IMPORTANT_JOBS list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER_SUPPLY, JOB_SECURITY_OFFICER_SCIENCE, JOB_SECURITY_OFFICER_ENGINEERING, JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_CHIEF_MEDICAL_OFFICER, JOB_DETECTIVE, JOB_CHIEF_ENGINEER ) // THIS SHALL BE IN CONFIG, BUT I'M VERY LAZY, OKAY? #define METACOIN_ICON_PATH "icons/obj/economy.dmi" #define METACOIN_ICON_STATE "coin_tails" // someone get us a nice lil' carp_coin sprite, or "masscoin"