config reorganize start

code/controllers/configuration/entries/antag_rep.dm

@@ -0,0 +1,17 @@
+/datum/config_entry/flag/use_antag_rep // see game_options.txt for details
+
+/datum/config_entry/number/antag_rep_maximum
+	config_entry_value = 200
+	min_val = 0
+
+/datum/config_entry/number/default_antag_tickets
+	config_entry_value = 100
+	min_val = 0
+
+/datum/config_entry/number/max_tickets_per_roll
+	config_entry_value = 100
+	min_val = 0
+
+/datum/config_entry/keyed_list/antag_rep
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM

code/controllers/configuration/entries/game_options.dm

@@ -136,20 +136,6 @@
 
 /datum/config_entry/flag/allow_latejoin_antagonists	// If late-joining players can be traitor/changeling
 
-/datum/config_entry/flag/use_antag_rep // see game_options.txt for details
-
-/datum/config_entry/number/antag_rep_maximum
-	config_entry_value = 200
-	min_val = 0
-
-/datum/config_entry/number/default_antag_tickets
-	config_entry_value = 100
-	min_val = 0
-
-/datum/config_entry/number/max_tickets_per_roll
-	config_entry_value = 100
-	min_val = 0
-
 /datum/config_entry/number/midround_antag_time_check	// How late (in minutes you want the midround antag system to stay on, setting this to 0 will disable the system)
 	config_entry_value = 60
 	min_val = 0
@@ -472,18 +458,6 @@
 
 /datum/config_entry/flag/shift_time_realtime
 
-/datum/config_entry/keyed_list/antag_rep
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-
-/datum/config_entry/keyed_list/job_threat
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-
-/datum/config_entry/keyed_list/antag_threat
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-
 /datum/config_entry/number/monkeycap
 	config_entry_value = 64
 	min_val = 0

code/controllers/configuration/entries/threat.dm

@@ -0,0 +1,7 @@
+/datum/config_entry/keyed_list/job_threat
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/keyed_list/antag_threat
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 	if(!opened)
 		return ..()
 
-/mob/living/silicon/robot/shove_act(mob/living/carbon/human/H)
+/mob/living/silicon/robot/disarm_shove(mob/living/carbon/human/H)
 	visible_message(span_danger("[src]'s motors grind as they are shoved by [H]!"))
 	vtec_disable(10 SECONDS)
 

code/modules/mob/living/silicon/silicon_defense.dm

@@ -80,7 +80,7 @@
 							"<span class='notice'>You pet [src].</span>", target = src,
 							target_message = "[M] pets you.")
 		if(INTENT_DISARM)
-			shove_act(M)
+			disarm_shove(M)
 		if(INTENT_GRAB)
 			grabbedby(M)
 		else
@@ -90,7 +90,7 @@
 				"<span class='warning'>[M] punches you, but doesn't leave a dent.</span>", null, COMBAT_MESSAGE_RANGE, null, M,
 				"<span class='danger'>You punch [src], but don't leave a dent.</span>")
 
-/mob/living/silicon/proc/shove_act(mob/living/carbon/human/H)
+/mob/living/silicon/proc/disarm_shove(mob/living/carbon/human/H)
 	visible_message(span_danger("[H] shoves [src], but doesn't manage to make much of an effect."))
 
 /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M)