diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index d29391f0772..441b561090d 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -181,7 +181,7 @@ #define ACCESS_CENT_CAPTAIN "cent_captain" #define ACCESS_CENT_BAR "cent_bar" /// Special Ops. Captain's display case, Marauder and Seraph mechs. -#define ACCESS_CENT_SPECOPS 188 ///Remind me to separate to captain, centcom, and syndicate mech access later -SonofSpace +#define ACCESS_CENT_SPECOPS "cent_specops" /// - - - ANTAGONIST - - - /// SYNDICATE diff --git a/code/controllers/subsystem/networks/id_access.dm b/code/controllers/subsystem/networks/id_access.dm index c3f3aad2e36..43d5ea2b61a 100644 --- a/code/controllers/subsystem/networks/id_access.dm +++ b/code/controllers/subsystem/networks/id_access.dm @@ -558,12 +558,12 @@ SUBSYSTEM_DEF(id_access) . = __in_character_record_id_information(astype(target.get_idcard(), /obj/item/card/id/advanced)) return . .["name"] = target.name - .["age"] = "INSPECT MANUFACTURER MANIFEST" - .["assignment"] = 0 - .["account_id"] = "NO ACCOUNT." - .["account_holder"] = "NO ACCOUNT." - .["account_assignment"] = "N/A" - .["accesses"] = target.mind?.assigned_role?.title + .["age"] = 0 + .["assignment"] = "Silicon" + .["account_id"] = null + .["account_holder"] = null + .["account_assignment"] = null + .["accesses"] = null .[SILICON_OVERRIDE] = SILICON_OVERRIDE return . var/obj/item/card/id/advanced/id_card = astype(target_of_record, /obj/item/card/id/advanced) diff --git a/code/datums/components/material/material_container.dm b/code/datums/components/material/material_container.dm index 6b6d26e7e44..9a8f9b4647e 100644 --- a/code/datums/components/material/material_container.dm +++ b/code/datums/components/material/material_container.dm @@ -736,7 +736,7 @@ /datum/component/material_container/proc/retrieve_all(target = null, atom/context = parent) var/result = 0 for(var/MAT in materials) - result += retrieve_sheets(amount2sheet(materials[MAT]), MAT, target, context) + result += retrieve_sheets(amount2sheet(materials[MAT]), MAT, target, context, user_data = ID_DATA(null)) return result //============================================================================================ diff --git a/code/datums/components/material/remote_materials.dm b/code/datums/components/material/remote_materials.dm index 6a6d38cd787..6e37ea327e3 100644 --- a/code/datums/components/material/remote_materials.dm +++ b/code/datums/components/material/remote_materials.dm @@ -152,7 +152,7 @@ handles linking back and forth. new_container.materials[mat] += mat_amount mat_container.materials[mat] = 0 qdel(mat_container) - silo.connect_receptacle(src, parent) + new_silo.connect_receptacle(src, parent) if(!(mat_container_flags & MATCONTAINER_NO_INSERT)) RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_insert)) RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION_SECONDARY, PROC_REF(on_secondary_insert)) diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 1af23cd8d57..3271f316df5 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -104,7 +104,6 @@ radio.keyslot.channels[RADIO_CHANNEL_SECURITY] = TRUE radio.recalculateChannels() - /obj/machinery/ore_silo/Destroy() if (GLOB.ore_silo_default == src) GLOB.ore_silo_default = null @@ -114,6 +113,7 @@ ore_connected_machines = null materials = null + QDEL_NULL(radio) return ..() diff --git a/tgui/packages/tgui/interfaces/OreSilo.tsx b/tgui/packages/tgui/interfaces/OreSilo.tsx index a7ad68bd379..f9d276a85ad 100644 --- a/tgui/packages/tgui/interfaces/OreSilo.tsx +++ b/tgui/packages/tgui/interfaces/OreSilo.tsx @@ -68,7 +68,7 @@ type Data = { id_required: BooleanLike; }; -export const OreSilo = (props: any) => { +export const OreSilo = (props: Data) => { const { act, data } = useBackend(); const { SHEET_MATERIAL_AMOUNT, machines, logs } = data; @@ -107,7 +107,7 @@ export const OreSilo = (props: any) => { {currentTab === Tab.Logs && ( <> - + )}