Replace all secondary flags with bitflags stored in the flags_2 var

code/modules/mob/living/silicon/pai/software.dm

@@ -253,7 +253,7 @@
 					med.remove_hud_from(src)
 		if("translator")
 			if(href_list["toggle"])
-				if(!HAS_SECONDARY_FLAG(src, OMNITONGUE))
+				if(!(flags_2 & OMNITONGUE_2))
 					grant_all_languages(TRUE)
 					// this is PERMAMENT.
 		if("doorjack")
@@ -313,7 +313,7 @@
 		if(s == "medical HUD")
 			dat += "<a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Medical Analysis Suite</a>[(src.medHUD) ? "<font color=#55FF55> On</font>" : "<font color=#FF5555> Off</font>"] <br>"
 		if(s == "universal translator")
-			var/translator_on = HAS_SECONDARY_FLAG(src, OMNITONGUE)
+			var/translator_on = (flags_2 & OMNITONGUE_2)
 			dat += "<a href='byond://?src=\ref[src];software=translator;sub=0'>Universal Translator</a>[translator_on ? "<font color=#55FF55> On</font>" : "<font color=#FF5555> Off</font>"] <br>"
 		if(s == "projection array")
 			dat += "<a href='byond://?src=\ref[src];software=projectionarray;sub=0'>Projection Array</a> <br>"
@@ -465,7 +465,7 @@
 
 // Universal Translator
 /mob/living/silicon/pai/proc/softwareTranslator()
-	var/translator_on = HAS_SECONDARY_FLAG(src, OMNITONGUE)
+	var/translator_on = (flags_2 & OMNITONGUE_2)
 	. = {"<h3>Universal Translator</h3><br>
 				When enabled, this device will permamently be able to speak and understand all known forms of communication.<br><br>
 				The device is currently [translator_on ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled.</font><br>[translator_on ? "" : "<a href='byond://?src=\ref[src];software=translator;sub=0;toggle=1'>Activate Translation Module</a><br>"]"}

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