diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 104e69706c..a98e98896d 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -64,8 +64,8 @@ #define INIT_ORDER_TICKER 55 #define INIT_ORDER_INSTRUMENTS 53 #define INIT_ORDER_MAPPING 50 -#define INIT_ORDER_NETWORKS 45 -#define INIT_ORDER_ECONOMY 40 +#define INIT_ORDER_NETWORKS 40 +#define INIT_ORDER_ECONOMY 45 #define INIT_ORDER_ATOMS 30 #define INIT_ORDER_LANGUAGE 25 #define INIT_ORDER_MACHINES 20 diff --git a/code/__HELPERS/_cit_helpers.dm b/code/__HELPERS/_cit_helpers.dm index 5f78aeb740..86e8d1bc2b 100644 --- a/code/__HELPERS/_cit_helpers.dm +++ b/code/__HELPERS/_cit_helpers.dm @@ -105,16 +105,6 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE) if(!src.holder) return message_admins("[key_name_admin(usr)] manually reloaded mentors") -//LOOC toggles -/client/verb/listen_looc() - set name = "Show/Hide LOOC" - set category = "Preferences" - set desc = "Toggles seeing LocalOutOfCharacter chat" - prefs.chat_toggles ^= CHAT_LOOC - prefs.save_preferences() - to_chat(src, "You will [(prefs.chat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /mob/living/carbon/proc/has_penis() var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_PENIS) if(G && istype(G, /obj/item/organ/genital/penis)) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index bcc4697d0b..3d926e2f53 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -179,11 +179,14 @@ . = ..() if(mapload && access_txt) access = text2access(access_txt) - var/turf/T = get_turf(src) - if(bank_support == ID_FREE_BANK_ACCOUNT && is_vr_level(T.z)) //economy is quite exploitable on VR in so many ways. - bank_support = ID_NO_BANK_ACCOUNT - else if(bank_support == ID_LOCKED_BANK_ACCOUNT) - registered_account = new /datum/bank_account/remote/non_transferable(pick(GLOB.redacted_strings)) + switch(bank_support) + if(ID_FREE_BANK_ACCOUNT) + var/turf/T = get_turf(src) + if(is_vr_level(T.z)) //economy is exploitable on VR in so many ways. + bank_support = ID_NO_BANK_ACCOUNT + if(ID_LOCKED_BANK_ACCOUNT) + registered_account = new /datum/bank_account/remote/non_transferable(pick(GLOB.redacted_strings)) + /obj/item/card/id/vv_edit_var(var_name, var_value) . = ..() @@ -566,17 +569,6 @@ update_label("John Doe", "Clowny") access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS . = ..() -/obj/item/card/id/debug - name = "\improper Debug ID" - desc = "A debug ID card. Has ALL the all access, you really shouldn't have this." - icon_state = "centcom" - assignment = "Jannie" - -/obj/item/card/id/debug/Initialize() - access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access() - registered_account = SSeconomy.get_dep_account(ACCOUNT_CAR) - . = ..() - /obj/item/card/id/prisoner name = "prisoner ID card" desc = "You are a number, you are not a free man." @@ -785,4 +777,5 @@ update_label("John Doe", "Clowny") /obj/item/card/id/debug/Initialize() access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access() + registered_account = SSeconomy.get_dep_account(ACCOUNT_CAR) . = ..() diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm index 430018929d..bd3e4b5b56 100644 --- a/code/game/objects/items/stacks/cash.dm +++ b/code/game/objects/items/stacks/cash.dm @@ -3,8 +3,8 @@ singular_name = "bill" icon = 'icons/obj/economy.dmi' icon_state = "spacecash" - amount = INFINITY - max_amount = 20 + amount = 1 + max_amount = INFINITY throwforce = 0 throw_speed = 2 throw_range = 2 diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 00460e8a85..5587fcc0f9 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -7,7 +7,7 @@ GLOBAL_LIST_INIT(potentialRandomVRlevels, generateMapList(filename = "[global.co if(GLOB.awaydestinations.len) //crude, but it saves another var! return - if(GLOB.potentialRandomZlevels && GLOB.potentialRandomZlevels.len) + if(GLOB.potentialRandomZlevels?.len) to_chat(world, "Loading away mission...") var/map = pick(GLOB.potentialRandomZlevels) var/list/traits = list(ZTRAIT_AWAY = TRUE) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 1fbf93a914..408da744ec 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2275,6 +2275,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("ghost_pda") chat_toggles ^= CHAT_GHOSTPDA + if("income_pings") + chat_toggles ^= CHAT_BANKCARD + if("pull_requests") chat_toggles ^= CHAT_PULLR diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 2670e1bcf4..951e36f9a6 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -250,6 +250,17 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)() /datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_OOC +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_looc)() + set name = "Show/Hide LOOC" + set category = "Preferences" + set desc = "Toggles seeing LocalOutOfCharacter chat" + usr.client.prefs.chat_toggles ^= CHAT_LOOC + usr.client.prefs.save_preferences() + to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") + SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing LOOC", "[usr.client.prefs.chat_toggles & CHAT_LOOC ? "Enabled" : "Disabled"]")) +/datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C) + return C.prefs.chat_toggles & CHAT_LOOC + TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_bank_card)() set name = "Show/Hide Income Updates" set category = "Preferences" diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm index f9addc1f14..e8b6498c36 100644 --- a/code/modules/economy/account.dm +++ b/code/modules/economy/account.dm @@ -13,6 +13,8 @@ /datum/bank_account/New(newname, job) if(add_to_accounts) + if(!SSeconomy) + log_world("Wack") SSeconomy.bank_accounts += src account_holder = newname account_job = job @@ -42,7 +44,7 @@ return FALSE /datum/bank_account/proc/transfer_money(datum/bank_account/from, amount) - if(!transferable || !from.has_money(amount)) + if(!from.transferable || !from.has_money(amount)) return FALSE adjust_money(amount) from.adjust_money(-amount) @@ -77,7 +79,7 @@ */ var/mob/card_holder = recursive_loc_check(A, /mob) if(ismob(card_holder)) //If on a mob - if(card_holder.client && !(card_holder.client.prefs.chat_toggles & CHAT_BANKCARD) && !force) + if(!card_holder.client || (!(card_holder.client.prefs.chat_toggles & CHAT_BANKCARD) && !force)) return card_holder.playsound_local(get_turf(card_holder), 'sound/machines/twobeep.ogg', 50, TRUE) @@ -92,7 +94,7 @@ break else for(var/mob/M in A.loc) //If inside a container with other mobs (e.g. locker) - if(M.client && !(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force) + if(!M.client || (!(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force)) return M.playsound_local(get_turf(M), 'sound/machines/twobeep.ogg', 50, TRUE) if(M.can_hear())