Replace all secondary flags with bitflags stored in the flags_2 var

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

@@ -36,8 +36,8 @@
 	observer_screen_update(O,FALSE)
 	O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
 
-	if(DROPDEL & O.flags)
-		O.flags &= ~DROPDEL //we shouldn't HAVE things with DROPDEL in our modules, but better safe than runtiming horribly
+	if(O.flags_1 & DROPDEL_1)
+		O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
 
 	O.dropped(src)
 

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

@@ -1007,9 +1007,9 @@
 		status_flags &= ~CANPUSH
 
 	if(module.clean_on_move)
-		flags |= CLEAN_ON_MOVE
+		flags_1 |= CLEAN_ON_MOVE_1
 	else
-		flags &= ~CLEAN_ON_MOVE
+		flags_1 &= ~CLEAN_ON_MOVE_1
 
 	hat_offset = module.hat_offset
 

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

@@ -6,7 +6,7 @@
 	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 
 	var/list/basic_modules = list() //a list of paths, converted to a list of instances on New()
 	var/list/emag_modules = list() //ditto

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

@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm	(rejected hunks)
+@@ -121,7 +121,7 @@
+ 	if(I.loc != src)
+ 		I.forceMove(src)
+ 	modules += I
+-	I.flags |= NODROP
++	I.flags_1 |= NODROP_1
+ 	I.mouse_opacity = MOUSE_OPACITY_OPAQUE
+ 	if(nonstandard)
+ 		added_modules += I