Conflict fix

code/controllers/configuration/entries/game_options.dm

@@ -408,3 +408,5 @@
 
 /datum/config_entry/number/dropped_modes
 	config_entry_value = 3
+
+/datum/config_entry/flag/suicide_allowed

code/controllers/configuration/entries/general.dm

@@ -43,6 +43,8 @@
 
 /datum/config_entry/flag/log_vote	// log voting
 
+/datum/config_entry/flag/log_craft	// log crafting
+
 /datum/config_entry/flag/log_whisper	// log client whisper
 
 /datum/config_entry/flag/log_attack	// log attack messages

code/controllers/subsystem/throwing.dm

@@ -55,6 +55,7 @@ SUBSYSTEM_DEF(throwing)
 	var/dist_y
 	var/dx
 	var/dy
+	var/force = MOVE_FORCE_DEFAULT
 	var/pure_diagonal
 	var/diagonal_error
 	var/datum/callback/callback