Merge pull request #5129 from MistakeNot4892/dev

Update dev from staging/stable.

Author: MistakeNot4892

code/modules/materials/definitions/solids/materials_solid_wood.dm

@@ -39,7 +39,7 @@
 	dooropen_noise = 'sound/effects/doorcreaky.ogg'
 	door_icon_base = "wood"
 	destruction_desc = "splinters"
-	hitsound = 'sound/effects/woodhit.ogg'
+	hitsound = 'sound/effects/hit_wood.ogg'
 	conductive = 0
 	construction_difficulty = MAT_VALUE_NORMAL_DIY
 	dissolves_into = list(

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

@@ -10,7 +10,7 @@
 	category = PROG_UTIL
 	nanomodule_path = /datum/nano_module/program/scanner
 
-	var/using_scanner = 0	//Whether or not the program is synched with the scanner module.
+	var/using_scanner = 0	//Whether or not the program is synced with the scanner module.
 	var/data_buffer = ""	//Buffers scan output for saving/viewing.
 	var/scan_file_type = /datum/computer_file/data/text		//The type of file the data will be saved to.
 	var/list/metadata_buffer = list()

code/modules/nano/modules/law_manager.dm

@@ -216,4 +216,4 @@
 		return
 	for(var/mob/living/silicon/robot/robot in AI.connected_robots)
 		robot.sync()
-	log_and_message_admins("has syncronized [AI]'s laws with its borgs.")
+	log_and_message_admins("has synchronized [AI]'s laws with its borgs.")

code/modules/random_map/noise/forage.dm

@@ -129,7 +129,7 @@
 	if(floor.is_outside())
 
 		if(istype(flooring, /decl/flooring/rock))
-			if(prob(15)) // Static as current map has limited amount of rock turfs
+			if(prob(15) && !floor.contains_dense_objects()) // Static as current map has limited amount of rock turfs
 				var/rock_type = SAFEPICK(forage["rocks"])
 				new rock_type(floor)
 				return