mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 16:44:43 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync
This commit is contained in:
@@ -81,7 +81,7 @@
|
||||
to_chat(user, span_notice("You can't send credits to yourself."))
|
||||
return NT_PAY_SATUS_SENDER_IS_RECEIVER
|
||||
|
||||
for(var/account as anything in SSeconomy.bank_accounts_by_id)
|
||||
for(var/account in SSeconomy.bank_accounts_by_id)
|
||||
var/datum/bank_account/acc = SSeconomy.bank_accounts_by_id[account]
|
||||
if(acc.pay_token == token)
|
||||
recipient = acc
|
||||
|
||||
@@ -434,7 +434,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
|
||||
/datum/computer_file/program/virtual_pet/ui_static_data(mob/user)
|
||||
var/list/data = list()
|
||||
data["pet_state_icons"] = list()
|
||||
for(var/list_index as anything in pet_state_icons)
|
||||
for(var/list_index in pet_state_icons)
|
||||
var/list/sprite_location = pet_state_icons[list_index]
|
||||
data["pet_state_icons"] += list(list(
|
||||
"name" = list_index,
|
||||
@@ -446,7 +446,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
|
||||
"hat_name" = "none",
|
||||
))
|
||||
|
||||
for(var/type_index as anything in hat_selections)
|
||||
for(var/type_index in hat_selections)
|
||||
if(level >= hat_selections[type_index])
|
||||
var/obj/item/hat = type_index
|
||||
var/hat_name = initial(hat.name)
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
/obj/item/circuit_component/mod_program/ntnetmonitor/proc/get_pdas(datum/port/port)
|
||||
var/list/computers_with_messenger = list()
|
||||
for(var/messenger_ref as anything in GLOB.pda_messengers)
|
||||
for(var/messenger_ref in GLOB.pda_messengers)
|
||||
var/datum/computer_file/program/messenger/messenger = GLOB.pda_messengers[messenger_ref]
|
||||
computers_with_messenger |= WEAKREF(messenger.computer)
|
||||
all_messengers.set_output(computers_with_messenger)
|
||||
|
||||
Reference in New Issue
Block a user