cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/atom/hear.dm
+1 -1
View File
@@ -43,7 +43,7 @@
SIGNAL_HANDLER
return Hear(arglist(arguments))
/obj/item/circuit_component/hear/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods, message_range)
/obj/item/circuit_component/hear/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods, message_range)
if(!on.value)
return FALSE
if(speaker == parent?.shell)
code/modules/wiremod/core/integrated_circuit.dm
+2 -2
View File
@@ -231,14 +231,14 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
* * to_check - The component to check.
**/
/obj/item/integrated_circuit/proc/is_duplicate(obj/item/circuit_component/to_check)
for(var/component as anything in attached_components)
for(var/component in attached_components)
if(component == to_check)
continue
if(istype(component, to_check.type))
return TRUE
if(istype(component, /obj/item/circuit_component/module))
var/obj/item/circuit_component/module/module = component
for(var/module_component as anything in module.internal_circuit.attached_components)
for(var/module_component in module.internal_circuit.attached_components)
if(module_component == to_check)
continue
if(istype(module_component, to_check.type))