mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
Optimize a couple things
This commit is contained in:
@@ -69,11 +69,9 @@ var/list/civilian_cartridges = list(
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/cartridge/proc/update_programs(obj/item/device/pda/pda)
|
||||
for(var/A in programs)
|
||||
var/datum/data/pda/P = A
|
||||
for(var/datum/data/pda/P as anything in programs)
|
||||
P.pda = pda
|
||||
for(var/A in messenger_plugins)
|
||||
var/datum/data/pda/messenger_plugin/P = A
|
||||
for(var/datum/data/pda/messenger_plugin/P as anything in messenger_plugins)
|
||||
P.pda = pda
|
||||
|
||||
/obj/item/weapon/cartridge/engineering
|
||||
|
||||
@@ -136,8 +136,7 @@
|
||||
records["general"] = general_records.fields
|
||||
return records
|
||||
else
|
||||
for(var/A in sortRecord(data_core.general))
|
||||
var/datum/data/record/R = A
|
||||
for(var/datum/data/record/R as anything in sortRecord(data_core.general))
|
||||
if(R)
|
||||
records += list(list(Name = R.fields["name"], "ref" = "\ref[R]"))
|
||||
data["recordsList"] = records
|
||||
@@ -182,8 +181,7 @@
|
||||
|
||||
/datum/data/pda/app/crew_records/medical/load_records(datum/data/record/R)
|
||||
..(R)
|
||||
for(var/A in data_core.medical)
|
||||
var/datum/data/record/E = A
|
||||
for(var/datum/data/record/E as anything in data_core.medical)
|
||||
if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
|
||||
medical_records = E
|
||||
break
|
||||
@@ -208,8 +206,7 @@
|
||||
|
||||
/datum/data/pda/app/crew_records/security/load_records(datum/data/record/R)
|
||||
..(R)
|
||||
for(var/A in data_core.security)
|
||||
var/datum/data/record/E = A
|
||||
for(var/datum/data/record/E as anything in data_core.security)
|
||||
if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
|
||||
security_records = E
|
||||
break
|
||||
@@ -229,8 +226,7 @@
|
||||
supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock"
|
||||
var/supplyOrderCount = 0
|
||||
var/supplyOrderData[0]
|
||||
for(var/S in SSsupply.shoppinglist)
|
||||
var/datum/supply_order/SO = S
|
||||
for(var/datum/supply_order/SO as anything in SSsupply.shoppinglist)
|
||||
|
||||
supplyOrderCount++
|
||||
supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment))
|
||||
@@ -240,8 +236,7 @@
|
||||
|
||||
var/requestCount = 0
|
||||
var/requestData[0]
|
||||
for(var/S in SSsupply.order_history)
|
||||
var/datum/supply_order/SO = S
|
||||
for(var/datum/supply_order/SO as anything in SSsupply.order_history)
|
||||
if(SO.status != SUP_ORDER_REQUESTED)
|
||||
continue
|
||||
|
||||
|
||||
@@ -33,8 +33,7 @@
|
||||
else
|
||||
var/convopdas[0]
|
||||
var/pdas[0]
|
||||
for(var/A in PDAs)
|
||||
var/obj/item/device/pda/P = A
|
||||
for(var/obj/item/device/pda/P as anything in PDAs)
|
||||
var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
|
||||
|
||||
if(!P.owner || PM.toff || P == pda || PM.m_hidden)
|
||||
@@ -49,8 +48,7 @@
|
||||
|
||||
var/list/plugins = list()
|
||||
if(pda.cartridge)
|
||||
for(var/A in pda.cartridge.messenger_plugins)
|
||||
var/datum/data/pda/messenger_plugin/P = A
|
||||
for(var/datum/data/pda/messenger_plugin/P as anything in pda.cartridge.messenger_plugins)
|
||||
plugins += list(list(name = P.name, icon = P.icon, ref = "\ref[P]"))
|
||||
data["plugins"] = plugins
|
||||
|
||||
@@ -148,8 +146,7 @@
|
||||
//var/telecomms_intact = telecomms_process(P.owner, owner, t)
|
||||
var/obj/machinery/message_server/useMS = null
|
||||
if(message_servers)
|
||||
for(var/A in message_servers)
|
||||
var/obj/machinery/message_server/MS = A
|
||||
for(var/obj/machinery/message_server/MS as anything in message_servers)
|
||||
//PDAs are now dependent on the Message Server.
|
||||
if(MS.active)
|
||||
useMS = MS
|
||||
@@ -194,8 +191,7 @@
|
||||
to_chat(usr, "Turn on your receiver in order to send messages.")
|
||||
return
|
||||
|
||||
for(var/A in PDAs)
|
||||
var/obj/item/device/pda/P = A
|
||||
for(var/obj/item/device/pda/P as anything in PDAs)
|
||||
var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
|
||||
|
||||
if(!P.owner || !PM || PM.hidden || P == pda || PM.toff)
|
||||
|
||||
@@ -197,8 +197,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
shortcut_cache.Cut()
|
||||
|
||||
/obj/item/device/pda/proc/update_programs()
|
||||
for(var/A in programs)
|
||||
var/datum/data/pda/P = A
|
||||
for(var/datum/data/pda/P as anything in programs)
|
||||
P.pda = src
|
||||
|
||||
/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P)
|
||||
|
||||
@@ -22,8 +22,7 @@
|
||||
if(cartridge)
|
||||
prog_list |= cartridge.programs
|
||||
|
||||
for(var/A in prog_list)
|
||||
var/datum/data/pda/P = A
|
||||
for(var/datum/data/pda/P as anything in prog_list)
|
||||
|
||||
if(P.hidden)
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user