shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I set amount instead of max_amount to INFINITY, that's why it hanged.

Browse Source
This commit is contained in:
Ghommie
2020-04-17 21:52:08 +02:00
parent 4c6f1b622b
commit 3dab97b62f
8 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/awaymissions/zlevel.dm
View File

@@ -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, "<span class='boldannounce'>Loading away mission...</span>")
var/map = pick(GLOB.potentialRandomZlevels)
var/list/traits = list(ZTRAIT_AWAY = TRUE)

3
code/modules/client/preferences.dm
View File

@@ -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

11
code/modules/client/preferences_toggles.dm
View File

@@ -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"

8
code/modules/economy/account.dm
View File

@@ -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())