Skip to content

Commit 71ce42c

Browse files
Merge branch 'stable' of github.com:NebulaSS13/Nebula into dev
2 parents f368468 + 0f74294 commit 71ce42c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

code/modules/modular_computers/file_system/programs/generic/scanner.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
category = PROG_UTIL
1111
nanomodule_path = /datum/nano_module/program/scanner
1212

13-
var/using_scanner = 0 //Whether or not the program is synched with the scanner module.
13+
var/using_scanner = 0 //Whether or not the program is synced with the scanner module.
1414
var/data_buffer = "" //Buffers scan output for saving/viewing.
1515
var/scan_file_type = /datum/computer_file/data/text //The type of file the data will be saved to.
1616
var/list/metadata_buffer = list()

code/modules/nano/modules/law_manager.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,4 @@
216216
return
217217
for(var/mob/living/silicon/robot/robot in AI.connected_robots)
218218
robot.sync()
219-
log_and_message_admins("has syncronized [AI]'s laws with its borgs.")
219+
log_and_message_admins("has synchronized [AI]'s laws with its borgs.")

0 commit comments

Comments
 (0)