config reorganize start

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)