diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
index b83e6187486..2991e162d78 100644
--- a/code/controllers/subsystem/jobs.dm
+++ b/code/controllers/subsystem/jobs.dm
@@ -667,6 +667,21 @@ SUBSYSTEM_DEF(jobs)
H.mind.initial_account = M
+ H.mind.initial_account.insurance_type = job.insurance_type
+ switch (job.insurance_type)
+ if (INSURANCE_TYPE_NONE)
+ H.mind.initial_account.insurance = INSURANCE_NONE
+ if (INSURANCE_TYPE_BUDGETARY)
+ H.mind.initial_account.insurance = INSURANCE_BUDGETARY
+ if (INSURANCE_TYPE_STANDART)
+ H.mind.initial_account.insurance = INSURANCE_STANDART
+ if (INSURANCE_TYPE_EXTENDED)
+ H.mind.initial_account.insurance = INSURANCE_EXTENDED
+ if (INSURANCE_TYPE_DELUXE)
+ H.mind.initial_account.insurance = INSURANCE_DELUXE
+ if (INSURANCE_TYPE_NT_SPECIAL)
+ H.mind.initial_account.insurance = INSURANCE_NT_SPECIAL
+
spawn(0)
to_chat(H, "Номер вашего аккаунта: [M.account_number], ПИН вашего аккаунта: [M.remote_access_pin]")
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 6219e9edb15..562351f0259 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -282,24 +282,6 @@
C.age = H.age
C.name = "[C.registered_name]'s ID Card ([C.assignment])"
C.photo = get_id_photo(H)
-
- if(H.mind && H.mind.initial_account)
- C.associated_account_number = H.mind.initial_account.account_number
- H.mind.initial_account.insurance_type = J.insurance_type
- switch (J.insurance_type)
- if (INSURANCE_TYPE_NONE)
- H.mind.initial_account.insurance = INSURANCE_NONE
- if (INSURANCE_TYPE_BUDGETARY)
- H.mind.initial_account.insurance = INSURANCE_BUDGETARY
- if (INSURANCE_TYPE_STANDART)
- H.mind.initial_account.insurance = INSURANCE_STANDART
- if (INSURANCE_TYPE_EXTENDED)
- H.mind.initial_account.insurance = INSURANCE_EXTENDED
- if (INSURANCE_TYPE_DELUXE)
- H.mind.initial_account.insurance = INSURANCE_DELUXE
- if (INSURANCE_TYPE_NT_SPECIAL)
- H.mind.initial_account.insurance = INSURANCE_NT_SPECIAL
-
C.owner_uid = H.UID()
C.owner_ckey = H.ckey
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index b45df189573..a26d3df48f2 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -15,6 +15,7 @@
/obj/machinery/bodyscanner/Destroy()
go_out()
+ eject_id()
return ..()
/obj/machinery/bodyscanner/power_change(forced = FALSE)
@@ -171,6 +172,17 @@
add_fingerprint(user)
ui_interact(user)
+/obj/machinery/bodyscanner/attackby(obj/item/I, mob/user)
+ if (istype(I, /obj/item/card/id))
+ if (inserted_id)
+ user.balloon_alert(src, "Занято")
+ else
+ inserted_id = I
+ I.forceMove(src)
+ user.balloon_alert(src, "Карта вставлена")
+
+ . = ..()
+
/obj/machinery/bodyscanner/relaymove(mob/user)
if(user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return FALSE //maybe they should be able to get out with cuffs, but whatever
@@ -197,6 +209,13 @@
A.forceMove(loc)
SStgui.update_uis(src)
+/obj/machinery/bodyscanner/proc/eject_id()
+ if(!inserted_id)
+ return
+ inserted_id.forceMove(loc)
+ inserted_id = null
+ SStgui.update_uis(src)
+
/obj/machinery/bodyscanner/force_eject_occupant(mob/target)
go_out()
@@ -232,6 +251,7 @@
var/list/data = list()
data["occupied"] = occupant ? TRUE : FALSE
+ data["has_id"] = inserted_id ? TRUE : FALSE
var/occupantData[0]
if(occupant)
@@ -390,6 +410,8 @@
isPrinting = FALSE
if ("insurance")
do_insurance_collection(occupant, inserted_id ? inserted_id.associated_account_number : null)
+ if ("eject_id")
+ eject_id()
else
return FALSE
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index b6108e220f4..64f7d9abe46 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -11,6 +11,7 @@ log transactions
#define CHANGE_SECURITY_LEVEL 1
#define TRANSFER_FUNDS 2
#define VIEW_TRANSACTION_LOGS 3
+#define CHANGE_INSURANCE_TYPE 4
#define PRINT_DELAY 100
#define LOCKOUT_TIME 120
@@ -172,6 +173,7 @@ log transactions
data["owner_name"] = authenticated_account.owner_name
data["money"] = authenticated_account.money
data["insurance"] = authenticated_account.insurance
+ data["insurance_type"] = authenticated_account.insurance_type
data["security_level"] = authenticated_account.security_level
var/list/trx = list()
@@ -209,7 +211,7 @@ log transactions
to_chat(usr, "[bicon(src)]You don't have enough funds to do that!")
if("view_screen")
- var/list/valid_screen = list(DEFAULT_SCREEN, CHANGE_SECURITY_LEVEL, TRANSFER_FUNDS, VIEW_TRANSACTION_LOGS)
+ var/list/valid_screen = list(DEFAULT_SCREEN, CHANGE_SECURITY_LEVEL, TRANSFER_FUNDS, VIEW_TRANSACTION_LOGS, CHANGE_INSURANCE_TYPE)
var/screen_proper = text2num(params["view_screen"])
if(screen_proper in valid_screen)
view_screen = screen_proper
@@ -222,6 +224,11 @@ log transactions
var/new_sec_level = max(min(params["new_security_level"], 2), 0)
authenticated_account.security_level = new_sec_level
+ if("change_insurance_type")
+ if(authenticated_account)
+ var/new_insurance_type = params["new_insurance_type"]
+ authenticated_account.insurance_type = new_insurance_type
+
if("attempt_auth")
if(linked_db)
if(!ticks_left_locked_down)
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 47cf31d560a..bfdb1b0bac9 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -51,7 +51,7 @@ GLOBAL_LIST_EMPTY(dna2account)
//the current ingame time (hh:mm:ss) can be obtained by calling:
//station_time_timestamp("hh:mm:ss")
-/proc/create_account(var/new_owner_name = "Default user", var/starting_funds = 0, var/obj/machinery/computer/account_database/source_db)
+/proc/create_account(var/new_owner_name = "Default user", var/starting_funds = 0, var/obj/machinery/computer/account_database/source_db, is_roundstart)
//create a new account
var/datum/money_account/M = new()
diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm
index 9623b112db6..e05b769b38e 100644
--- a/code/modules/economy/Accounts_DB.dm
+++ b/code/modules/economy/Accounts_DB.dm
@@ -154,9 +154,11 @@ GLOBAL_VAR(current_date_string)
starting_funds = clamp(starting_funds, 0, GLOB.station_account.money) // Not authorized to put the station in debt.
starting_funds = min(starting_funds, fund_cap) // Not authorized to give more than the fund cap.
- var/datum/money_account/M = create_account(account_name, starting_funds, src)
+ var/datum/money_account/M = create_account(account_name, starting_funds, src, FALSE)
if(starting_funds > 0)
GLOB.station_account.charge(starting_funds, null, "New account activation", "", "New account activation", M.owner_name)
+ M.insurance_type = INSURANCE_TYPE_BUDGETARY
+ M.insurance = INSURANCE_NONE
current_page = AUT_ACCLST
diff --git a/tgui/packages/tgui/interfaces/ATM.js b/tgui/packages/tgui/interfaces/ATM.js
index 0e7f14b36e1..8a4979043c2 100644
--- a/tgui/packages/tgui/interfaces/ATM.js
+++ b/tgui/packages/tgui/interfaces/ATM.js
@@ -54,6 +54,9 @@ export const ATM = (props, context) => {
case 3: // VIEW_TRANSACTION_LOGS
body = ;
break;
+ case 4: // CHANGE_INSURANCE_TYPE
+ body = ;
+ break;
default:
body = ;
}
@@ -197,14 +200,56 @@ const TransferFunds = (props, context) => {
);
};
-const DefaultScreen = (props, context) => {
+const ChangeInsuranceType = (props, context) => {
const { act, data } = useBackend(context);
- const [fundsAmount, insuranceAmount, setFundsAmount, setInsuranceAmount] = useLocalState(
- context,
- 'fundsAmount',
- 'insuranceAmount',
- 0
+ const { insurance_type } = data;
+ return (
+
+
+
+
+
+
+
);
+};
+
+const DefaultScreen = (props, context) => {
+ const { act, data } = useBackend(context);
+ const [fundsAmount, insuranceAmount, setFundsAmount, setInsuranceAmount] =
+ useLocalState(context, 'fundsAmount', 'insuranceAmount', 0);
const { owner_name, money, insurance } = data;
return (
<>
@@ -231,7 +276,9 @@ const DefaultScreen = (props, context) => {
/>
- ${insurance}
+
+ ${insurance}
+
setInsuranceAmount(value)} />
@@ -239,7 +286,9 @@ const DefaultScreen = (props, context) => {