ok this is going to be a pain in the ass ain't it (#2458)

lets hope nothing blows up this time (Flags PR but it works!)

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

@@ -4,9 +4,9 @@
 	icon_state = "std_module"
 	w_class = WEIGHT_CLASS_GIGANTIC
 	item_state = "electronic"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags = CONDUCT
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	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
@@ -121,8 +121,8 @@
 	if(I.loc != src)
 		I.forceMove(src)
 	modules += I
-	I.flags |= NODROP
-	I.mouse_opacity = MOUSE_OPACITY_OPAQUE
+	I.flags_1 |= NODROP_1
+	I.mouse_opacity = MOUSE_OPACITY_OPAQUE
 	if(nonstandard)
 		added_modules += I
 	if(requires_rebuild)
@@ -248,7 +248,7 @@
 		/obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg,
 		/obj/item/weapon/soap/nanotrasen,
 		/obj/item/borg/cyborghug)
-	emag_modules = list(/obj/item/weapon/melee/transforming/energy/sword/cyborg)
+	emag_modules = list(/obj/item/weapon/melee/transforming/energy/sword/cyborg)
 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg,
 		/obj/item/clockwork/ratvarian_spear/cyborg,
@@ -471,7 +471,7 @@
 		/obj/item/stack/tile/plasteel/cyborg,
 		/obj/item/weapon/soap/nanotrasen,
 		/obj/item/weapon/storage/bag/trash/cyborg,
-		/obj/item/weapon/extinguisher/mini,
+		/obj/item/weapon/extinguisher/mini,
 		/obj/item/weapon/mop/cyborg,
 		/obj/item/device/lightreplacer/cyborg,
 		/obj/item/weapon/holosign_creator,
@@ -518,7 +518,7 @@
 		/obj/item/weapon/reagent_containers/food/condiment/enzyme,
 		/obj/item/weapon/pen,
 		/obj/item/toy/crayon/spraycan/borg,
-		/obj/item/weapon/extinguisher/mini,
+		/obj/item/weapon/extinguisher/mini,
 		/obj/item/weapon/hand_labeler/borg,
 		/obj/item/weapon/razor,
 		/obj/item/device/instrument/violin,
@@ -594,7 +594,7 @@
 	name = "Syndicate Assault"
 	basic_modules = list(
 		/obj/item/device/assembly/flash/cyborg,
-		/obj/item/weapon/melee/transforming/energy/sword/cyborg,
+		/obj/item/weapon/melee/transforming/energy/sword/cyborg,
 		/obj/item/weapon/gun/energy/printer,
 		/obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg,
 		/obj/item/weapon/card/emag,
@@ -621,7 +621,7 @@
 		/obj/item/weapon/hemostat,
 		/obj/item/weapon/cautery,
 		/obj/item/weapon/scalpel,
-		/obj/item/weapon/melee/transforming/energy/sword/cyborg/saw,
+		/obj/item/weapon/melee/transforming/energy/sword/cyborg/saw,
 		/obj/item/roller/robo,
 		/obj/item/weapon/card/emag,
 		/obj/item/weapon/crowbar/cyborg,

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