Configuration datum refactor

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

@@ -207,13 +207,18 @@
 	"Medical" = /obj/item/robot_module/medical, \
 	"Miner" = /obj/item/robot_module/miner, \
 	"Janitor" = /obj/item/robot_module/janitor, \
+<<<<<<< HEAD
 	"Service" = /obj/item/robot_module/butler, \
 	"MediHound" = /obj/item/robot_module/medihound, \
 	"Security K9" = /obj/item/robot_module/k9, \
 	"Scrub Puppy" = /obj/item/robot_module/scrubpup)
 	if(!config.forbid_peaceborg)
+=======
+	"Service" = /obj/item/robot_module/butler)
+	if(!CONFIG_GET(flag/disable_peaceborg))
+>>>>>>> 4178c20... Configuration datum refactor (#30763)
 		modulelist["Peacekeeper"] = /obj/item/robot_module/peacekeeper
-	if(!config.forbid_secborg)
+	if(!CONFIG_GET(flag/disable_secborg))
 		modulelist["Security"] = /obj/item/robot_module/security
 
 	var/input_module = input("Please, select a module!", "Robot", null, null) as null|anything in modulelist

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

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /mob/living/silicon/robot/Process_Spacemove(movement_dir = 0)
 	if(ionpulse())
 		return 1
@@ -22,3 +23,31 @@
 	. = ..()
 	if(riding_datum)
 		riding_datum.on_vehicle_move()
+=======
+/mob/living/silicon/robot/Process_Spacemove(movement_dir = 0)
+	if(ionpulse())
+		return 1
+	return ..()
+
+/mob/living/silicon/robot/movement_delay()
+	. = ..()
+	var/static/config_robot_delay
+	if(isnull(config_robot_delay))
+		config_robot_delay = CONFIG_GET(number/robot_delay)
+	. += speed + config_robot_delay
+
+/mob/living/silicon/robot/mob_negates_gravity()
+	return magpulse
+
+/mob/living/silicon/robot/mob_has_gravity()
+	return ..() || mob_negates_gravity()
+
+/mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction)
+	if(!magpulse)
+		return ..()
+
+/mob/living/silicon/robot/Moved()
+	. = ..()
+	if(riding_datum)
+		riding_datum.on_vehicle_move()
+>>>>>>> 4178c20... Configuration datum refactor (#30763)

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

@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 /mob/living/silicon/robot/IsVocal()
 	return !config.silent_borg
+=======
+/mob/living/silicon/robot/IsVocal()
+	return !CONFIG_GET(flag/silent_borg)
+>>>>>>> 4178c20... Configuration datum refactor (#30763)