From 35498c42bd9a9b1e33736567ea7280bb846862a5 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 15 Sep 2023 23:11:00 +0100 Subject: [PATCH 1/5] survivor payday --- code/game/jobs/job/civilians/other/survivors.dm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index ff2d7d229fba..4eb14262ce22 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -15,9 +15,21 @@ spawn_positions = Clamp((round(count * SURVIVOR_TO_TOTAL_SPAWN_RATIO)), 2, 8) total_positions = spawn_positions -/datum/job/civilian/survivor/equip_job(mob/living/M) +/datum/job/civilian/survivor/equip_job(mob/living/survivor) + var/generated_account = generate_money_account(survivor) + addtimer(CALLBACK(src, PROC_REF(announce_entry_message), survivor, generated_account), 2 SECONDS) return +/datum/job/civilian/survivor/announce_entry_message(mob/living/carbon/human/H, datum/money_account/M, whitelist_status) //The actual message that is displayed to the mob when they enter the game as a new player. + if(H && H.loc && H.client) + //Document syntax cannot have tabs for proper formatting. + var/entrydisplay = " \ + [SPAN_ROLE_BODY("|______________________|")] \n\ + [SPAN_ROLE_BODY("[generate_entry_message(H)]
[M ? "Your account number is: [M.account_number]. Your account pin is: [M.remote_access_pin]." : "You do not have a bank account."]")] \n\ + [SPAN_ROLE_BODY("|______________________|")] \ + " + to_chat_spaced(H, html = entrydisplay) + /datum/job/civilian/survivor/spawn_in_player(mob/new_player/NP) . = ..() var/mob/living/carbon/human/H = . From e13a1dcdc6387b18be309b9973caa549c20403f2 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 22 Sep 2023 03:24:59 +0100 Subject: [PATCH 2/5] var names --- code/game/jobs/job/civilians/other/survivors.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index 4eb14262ce22..0c91d8de2e32 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -20,15 +20,15 @@ addtimer(CALLBACK(src, PROC_REF(announce_entry_message), survivor, generated_account), 2 SECONDS) return -/datum/job/civilian/survivor/announce_entry_message(mob/living/carbon/human/H, datum/money_account/M, whitelist_status) //The actual message that is displayed to the mob when they enter the game as a new player. - if(H && H.loc && H.client) +/datum/job/civilian/survivor/announce_entry_message(mob/living/carbon/human/survivor, datum/money_account/account, whitelist_status) //The actual message that is displayed to the mob when they enter the game as a new player. + if(survivor && survivor.loc && survivor.client) //Document syntax cannot have tabs for proper formatting. var/entrydisplay = " \ [SPAN_ROLE_BODY("|______________________|")] \n\ - [SPAN_ROLE_BODY("[generate_entry_message(H)]
[M ? "Your account number is: [M.account_number]. Your account pin is: [M.remote_access_pin]." : "You do not have a bank account."]")] \n\ + [SPAN_ROLE_BODY("[generate_entry_message(survivor)]
[M ? "Your account number is: [account.account_number]. Your account pin is: [account.remote_access_pin]." : "You do not have a bank account."]")] \n\ [SPAN_ROLE_BODY("|______________________|")] \ " - to_chat_spaced(H, html = entrydisplay) + to_chat_spaced(survivor, html = entrydisplay) /datum/job/civilian/survivor/spawn_in_player(mob/new_player/NP) . = ..() From 9f96b29e0868516ee4f599bed5462e8c4f384281 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 22 Sep 2023 03:29:39 +0100 Subject: [PATCH 3/5] shhh --- code/game/jobs/job/civilians/other/survivors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index 0c91d8de2e32..032a6f2ceb66 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -25,7 +25,7 @@ //Document syntax cannot have tabs for proper formatting. var/entrydisplay = " \ [SPAN_ROLE_BODY("|______________________|")] \n\ - [SPAN_ROLE_BODY("[generate_entry_message(survivor)]
[M ? "Your account number is: [account.account_number]. Your account pin is: [account.remote_access_pin]." : "You do not have a bank account."]")] \n\ + [SPAN_ROLE_BODY("[generate_entry_message(survivor)]
[account ? "Your account number is: [account.account_number]. Your account pin is: [account.remote_access_pin]." : "You do not have a bank account."]")] \n\ [SPAN_ROLE_BODY("|______________________|")] \ " to_chat_spaced(survivor, html = entrydisplay) From 1a863cde7c45c7571f701a1d26b6f769c1461190 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 22 Sep 2023 03:38:50 +0100 Subject: [PATCH 4/5] requested --- code/game/jobs/job/civilians/other/survivors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index 032a6f2ceb66..cd1b39d6c5c7 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -21,7 +21,7 @@ return /datum/job/civilian/survivor/announce_entry_message(mob/living/carbon/human/survivor, datum/money_account/account, whitelist_status) //The actual message that is displayed to the mob when they enter the game as a new player. - if(survivor && survivor.loc && survivor.client) + if(survivor?.loc && survivor?.client) //Document syntax cannot have tabs for proper formatting. var/entrydisplay = " \ [SPAN_ROLE_BODY("|______________________|")] \n\ From f6a1aed1f880c0e77ec3ef0d82914bacb3b9c0a6 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Thu, 21 Sep 2023 22:06:50 -0700 Subject: [PATCH 5/5] Update survivors.dm --- code/game/jobs/job/civilians/other/survivors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index cd1b39d6c5c7..5c82241c47de 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -21,7 +21,7 @@ return /datum/job/civilian/survivor/announce_entry_message(mob/living/carbon/human/survivor, datum/money_account/account, whitelist_status) //The actual message that is displayed to the mob when they enter the game as a new player. - if(survivor?.loc && survivor?.client) + if(survivor?.loc && survivor.client) //Document syntax cannot have tabs for proper formatting. var/entrydisplay = " \ [SPAN_ROLE_BODY("|______________________|")] \n\