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/__DEFINES/MC.dm

@@ -22,7 +22,7 @@
 #define START_PROCESSING(Processor, Datum) if (!Datum.isprocessing) {Datum.isprocessing = TRUE;Processor.processing += Datum}
 #define STOP_PROCESSING(Processor, Datum) Datum.isprocessing = FALSE;Processor.processing -= Datum
 
-//SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier)
+//SubSystem flags_1 (Please design any new flags_1 so that the default is off, to make adding flags_1 to subsystems easier)
 
 //subsystem does not initialize.
 #define SS_NO_INIT 1

code/__DEFINES/admin.dm

@@ -1,6 +1,6 @@
 //A set of constants used to determine which type of mute an admin wishes to apply:
 //Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
-//Therefore there needs to be a gap between the flags for the automute flags
+//Therefore there needs to be a gap between the flags_1 for the automute flags_1
 #define MUTE_IC			1
 #define MUTE_OOC		2
 #define MUTE_PRAY		4
@@ -39,7 +39,7 @@
 #error Remove the flag below , its been long enough
 #endif
 //legacy , remove post 512, it was replaced by R_POLL
-#define R_REJUVINATE	2 
+#define R_REJUVINATE	2
 
 #define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
 
@@ -50,7 +50,7 @@
 #define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=\ref[user]'>SM</a>)"
 #define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=\ref[user]'>TP</a>)"
 #define ADMIN_KICK(user) "(<a href='?_src_=holder;boot2=\ref[user]'>KICK</a>)"
-#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentComReply=\ref[user]'>RPLY</a>)"
+#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentComReply=\ref[user]'>RPLY</a>)"
 #define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=\ref[user]'>RPLY</a>)"
 #define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=\ref[user]'>SC</a>)"
 #define ADMIN_SMITE(user) "(<a href='?_src_=holder;adminsmite=\ref[user]'>SMITE</a>)"

code/__DEFINES/flags.dm

@@ -1,5 +1,5 @@
 /*
-	These defines are specific to the atom/flags bitmask
+	These defines are specific to the atom/flags_1 bitmask
 */
 #define ALL ~0 //For convenience.
 #define NONE 0
@@ -7,58 +7,58 @@
 GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
 
 //FLAGS BITMASK
-#define STOPSPRESSUREDMAGE 1	//This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere
+#define STOPSPRESSUREDMAGE_1 1	//This flag is used on the flags_1 variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere
 //To successfully stop you taking all pressure damage you must have both a suit and head item with this flag.
 
-#define NODROP			2		// This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
-#define NOBLUDGEON		4		// when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
-#define MASKINTERNALS	8		// mask allows internals
-#define HEAR 			16		// This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not.
-#define CHECK_RICOCHET	32		// Projectiels will check ricochet on things impacted that have this.
-#define CONDUCT			64		// conducts electricity (metal etc.)
-#define ABSTRACT    	128		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
-#define NODECONSTRUCT  	128		// For machines and structures that should not break into parts, eg, holodeck stuff
-#define OVERLAY_QUEUED  256		//atom queued to SSoverlay
-#define ON_BORDER		512		// item has priority to check when entering or leaving
+#define NODROP_1			2		// This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
+#define NOBLUDGEON_1		4		// when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
+#define MASKINTERNALS_1		8		// mask allows internals
+#define HEAR_1 				16		// This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not.
+#define CHECK_RICOCHET_1	32		// Projectiels will check ricochet on things impacted that have this.
+#define CONDUCT_1			64		// conducts electricity (metal etc.)
+#define ABSTRACT_1		   	128		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
+#define NODECONSTRUCT_1  	128		// For machines and structures that should not break into parts, eg, holodeck stuff
+#define OVERLAY_QUEUED_1	256		// atom queued to SSoverlay
+#define ON_BORDER_1			512		// item has priority to check when entering or leaving
 
-#define NOSLIP		1024 		//prevents from slipping on wet floors, in space etc
-#define CLEAN_ON_MOVE 2048
+#define NOSLIP_1			1024 		//prevents from slipping on wet floors, in space etc
+#define CLEAN_ON_MOVE_1		2048
 
-// BLOCK_GAS_SMOKE_EFFECT only used in masks at the moment.
-#define BLOCK_GAS_SMOKE_EFFECT 4096	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
-#define THICKMATERIAL 8192		//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
-#define DROPDEL			16384 // When dropped, it calls qdel on itself
-#define PREVENT_CLICK_UNDER 32768 //Prevent clicking things below it on the same turf eg. doors/ fulltile windows
+// BLOCK_GAS_SMOKE_EFFECT_1 only used in masks at the moment.
+#define BLOCK_GAS_SMOKE_EFFECT_1 4096	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
+#define THICKMATERIAL_1			8192	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
+#define DROPDEL_1				16384	// When dropped, it calls qdel on itself
+#define PREVENT_CLICK_UNDER_1	32768	//Prevent clicking things below it on the same turf eg. doors/ fulltile windows
 
-/* Secondary atom flags, access using the SECONDARY_FLAG macros */
+/* Secondary atom flags, for the flags_2 var, denoted with a _2 */
 
-#define SLOWS_WHILE_IN_HAND "slows_while_in_hand"
-#define NO_EMP_WIRES "no_emp_wires"
-#define HOLOGRAM "hologram"
-#define FROZEN "frozen"
-#define STATIONLOVING "stationloving"
-#define INFORM_ADMINS_ON_RELOCATE "inform_admins_on_relocate"
-#define BANG_PROTECT "bang_protect"
+#define SLOWS_WHILE_IN_HAND_2	1
+#define NO_EMP_WIRES_2			2
+#define HOLOGRAM_2				4
+#define FROZEN_2				8
+#define STATIONLOVING_2			16
+#define INFORM_ADMINS_ON_RELOCATE_2	32
+#define BANG_PROTECT_2			64
 
 // An item worn in the ear slot with HEALS_EARS will heal your ears each
 // Life() tick, even if normally your ears would be too damaged to heal.
-#define HEALS_EARS "heals_ears"
+#define HEALS_EARS_2			128
 
 // A mob with OMNITONGUE has no restriction in the ability to speak
 // languages that they know. So even if they wouldn't normally be able to
 // through mob or tongue restrictions, this flag allows them to ignore
 // those restrictions.
-#define OMNITONGUE "omnitongue"
+#define OMNITONGUE_2			256
 
 // TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
-#define TESLA_IGNORE "tesla_ignore"
+#define TESLA_IGNORE_2			512
 
 //turf-only flags
-#define NOJAUNT		1
-#define UNUSED_TRANSIT_TURF 2
-#define CAN_BE_DIRTY 4 //If a turf can be made dirty at roundstart. This is also used in areas.
-#define NO_DEATHRATTLE 16 // Do not notify deadchat about any deaths that occur on this turf.
-//#define CHECK_RICOCHET	32		//Same thing as atom flag.
+#define NOJAUNT_1				1
+#define UNUSED_TRANSIT_TURF_1	2
+#define CAN_BE_DIRTY_1			4 // If a turf can be made dirty at roundstart. This is also used in areas.
+#define NO_DEATHRATTLE_1		16 // Do not notify deadchat about any deaths that occur on this turf.
+//#define CHECK_RICOCHET_1	32		//Same thing as atom flag.
 
 /*
 	These defines are used specifically with the atom/pass_flags bitmask
@@ -90,5 +90,3 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define ACID_PROOF 32 //acid stuck on it doesn't melt it.
 #define INDESTRUCTIBLE 64 //doesn't take damage
 #define FREEZE_PROOF 128 //can't be frozen
-
-// language secondary flags for atoms

code/__DEFINES/inventory.dm

@@ -86,7 +86,7 @@
 			. = SLOT_POCKET
 
 
-//Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.
+//Bit flags_1 for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.
 #define HIDEGLOVES		1
 #define HIDESUITSTORAGE	2
 #define HIDEJUMPSUIT	4	//these first four are only used in exterior suits
@@ -134,17 +134,17 @@
 #define THERMAL_PROTECTION_HAND_LEFT	0.025
 #define THERMAL_PROTECTION_HAND_RIGHT	0.025
 
-//flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
+//flags_1 for female outfits: How much the game can safely "take off" the uniform without it looking weird
 #define NO_FEMALE_UNIFORM			0
 #define FEMALE_UNIFORM_FULL			1
 #define FEMALE_UNIFORM_TOP			2
 
-//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
+//flags_1 for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
 #define NORMAL_STYLE		0
 #define ALT_STYLE			1
 #define DIGITIGRADE_STYLE 	2
 
-//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
+//flags_1 for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
 #define NO_MUTANTRACE_VARIATION		0
 #define MUTANTRACE_VARIATION		1
 
@@ -152,9 +152,9 @@
 #define FULL_DIGITIGRADE			1
 #define SQUISHED_DIGITIGRADE		2
 
-//flags for covering body parts
+//flags_1 for covering body parts
 #define GLASSESCOVERSEYES	1
-#define MASKCOVERSEYES		2		// get rid of some of the other retardation in these flags
+#define MASKCOVERSEYES		2		// get rid of some of the other retardation in these flags_1
 #define HEADCOVERSEYES		4		// feel free to realloc these numbers for other purposes
 #define MASKCOVERSMOUTH		8		// on other items, these are just for mask/head
 #define HEADCOVERSMOUTH		16

code/__DEFINES/reagents.dm

@@ -2,10 +2,10 @@
 #define LIQUID 2
 #define GAS 3
 
-#define INJECTABLE		1024	//Makes reagents addable through droppers and syringes
-#define DRAWABLE		2048	//If a syringe can draw from it
-#define OPENCONTAINER	4096	//Is an open container for chemistry purposes
-#define TRANSPARENT		8192	//Used for non-open containers which you still want to be able to see the reagents off.
+#define INJECTABLE_1	1024	//Makes reagents addable through droppers and syringes
+#define DRAWABLE_1		2048	//If a syringe can draw from it
+#define OPENCONTAINER_1	4096	//Is an open container for chemistry purposes
+#define TRANSPARENT_1	8192	//Used for non-open containers which you still want to be able to see the reagents off.
 
 #define TOUCH 1 //splashing
 #define INGEST 2 //ingestion

code/__DEFINES/shuttles.dm

@@ -53,7 +53,7 @@
 #define ENGINE_COEFF_MAX 2
 #define ENGINE_DEFAULT_MAXSPEED_ENGINES 5
 
-//Docking error flags
+//Docking error flags_1
 #define DOCKING_SUCCESS 0
 #define DOCKING_COMPLETE 1
 #define DOCKING_BLOCKED 2

code/__DEFINES/sight.dm

@@ -25,6 +25,6 @@
 //for clothing visor toggles, these determine which vars to toggle
 #define VISOR_FLASHPROTECT 1
 #define VISOR_TINT 2
-#define VISOR_VISIONFLAGS 4 //all following flags only matter for glasses
+#define VISOR_VISIONFLAGS 4 //all following flags_1 only matter for glasses
 #define VISOR_DARKNESSVIEW 8
 #define VISOR_INVISVIEW 16

code/__HELPERS/flags.dm

@@ -1,4 +0,0 @@
-#define HAS_SECONDARY_FLAG(atom, sflag) (atom.secondary_flags ? atom.secondary_flags[sflag] : FALSE)
-#define SET_SECONDARY_FLAG(atom, sflag) if(!atom.secondary_flags) { atom.secondary_flags = list(); } atom.secondary_flags[sflag] = TRUE;
-#define CLEAR_SECONDARY_FLAG(atom, sflag) if(atom.secondary_flags) atom.secondary_flags[sflag] = null
-#define TOGGLE_SECONDARY_FLAG(atom, sflag) if(HAS_SECONDARY_FLAG(atom, sflag)) { CLEAR_SECONDARY_FLAG(atom, sflag); } else {SET_SECONDARY_FLAG(atom, sflag) ; }

code/__HELPERS/game.dm

@@ -164,7 +164,7 @@
 	. = list()
 	while(processing_list.len)
 		var/atom/A = processing_list[1]
-		if(A.flags & HEAR)
+		if(A.flags_1 & HEAR_1)
 			. += A
 		processing_list.Cut(1, 2)
 		processing_list += A.contents

code/__HELPERS/icons.dm

@@ -978,19 +978,19 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 	// Used to make the frozen item visuals for Freon.
 	if(resistance_flags & FREEZE_PROOF)
 		return
-	if(!HAS_SECONDARY_FLAG(src, FROZEN))
+	if(!(flags_2 & FROZEN_2))
 		name = "frozen [name]"
 		add_atom_colour(list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0)), TEMPORARY_COLOUR_PRIORITY)
 		alpha -= 25
-		SET_SECONDARY_FLAG(src, FROZEN)
+		flags_2 |= FROZEN_2
 
 //Assumes already frozed
 /obj/proc/make_unfrozen()
-	if(HAS_SECONDARY_FLAG(src, FROZEN))
+	if(flags_2 & FROZEN_2)
 		name = replacetext(name, "frozen ", "")
 		remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0)))
 		alpha += 25
-		CLEAR_SECONDARY_FLAG(src, FROZEN)
+		flags_2 &= ~FROZEN_2
 
 #undef FROZEN_RED_COLOR
 #undef FROZEN_GREEN_COLOR

code/_compile_options.dm

@@ -52,7 +52,7 @@
 #define AI_CAMERA_LUMINOSITY	5
 #define AI_VOX 1 // Comment out if you don't want VOX to be enabled and have players download the voice sounds.
 
-//Additional code for the above flags.
+//Additional code for the above flags_1.
 #ifdef TESTING
 #warn compiling in TESTING mode. testing() debug messages will be visible.
 #endif
@@ -69,7 +69,7 @@
 #error You need version 511 or higher
 #endif
 
-//Update this whenever the db schema changes 
+//Update this whenever the db schema changes
 //make sure you add an update to the schema_version stable in the db changelog
 #define DB_MAJOR_VERSION 3
 #define DB_MINOR_VERSION 0

code/_onclick/adjacent.dm

@@ -85,7 +85,7 @@
 
 /*
 	This checks if you there is uninterrupted airspace between that turf and this one.
-	This is defined as any dense ON_BORDER object, or any dense object without LETPASSTHROW.
+	This is defined as any dense ON_BORDER_1 object, or any dense object without LETPASSTHROW.
 	The border_only flag allows you to not objects (for source and destination squares)
 */
 /turf/proc/ClickCross(target_dir, border_only, target_atom = null, atom/movable/mover = null)
@@ -95,7 +95,7 @@
 		if(O == target_atom || (O.pass_flags & LETPASSTHROW)) //check if there's a dense object present on the turf
 			continue // LETPASSTHROW is used for anything you can click through (or the firedoor special case, see above)
 
-		if( O.flags&ON_BORDER) // windows are on border, check them first
+		if( O.flags_1&ON_BORDER_1) // windows are on border, check them first
 			if( O.dir & target_dir || O.dir & (O.dir-1) ) // full tile windows are just diagonals mechanically
 				return 0								  //O.dir&(O.dir-1) is false for any cardinal direction, but true for diagonal ones
 

code/_onclick/click.dm

@@ -144,7 +144,7 @@
 		else
 			RangedAttack(A,params)
 
-//Is the atom obscured by a PREVENT_CLICK_UNDER object above it
+//Is the atom obscured by a PREVENT_CLICK_UNDER_1 object above it
 /atom/proc/IsObscured()
 	if(!isturf(loc)) //This only makes sense for things directly on turfs for now
 		return FALSE
@@ -152,13 +152,13 @@
 	if(!T)
 		return FALSE
 	for(var/atom/movable/AM in T)
-		if(AM.flags & PREVENT_CLICK_UNDER && AM.density && AM.layer > layer)
+		if(AM.flags_1 & PREVENT_CLICK_UNDER_1 && AM.density && AM.layer > layer)
 			return TRUE
 	return FALSE
 
 /turf/IsObscured()
 	for(var/atom/movable/AM in src)
-		if(AM.flags & PREVENT_CLICK_UNDER && AM.density)
+		if(AM.flags_1 & PREVENT_CLICK_UNDER_1 && AM.density)
 			return TRUE
 	return FALSE
 

code/_onclick/hud/screen_objects.dm

@@ -258,7 +258,7 @@
 				var/obj/item/clothing/mask/M = C.wear_mask
 				if(M.mask_adjusted) // if mask on face but pushed down
 					M.adjustmask(C) // adjust it back
-				if( !(M.flags & MASKINTERNALS) )
+				if( !(M.flags_1 & MASKINTERNALS_1) )
 					to_chat(C, "<span class='warning'>You are not wearing an internals mask!</span>")
 					return
 

code/_onclick/item_attack.dm

@@ -35,7 +35,7 @@
 
 
 /obj/item/proc/attack(mob/living/M, mob/living/user)
-	if(flags & NOBLUDGEON)
+	if(flags_1 & NOBLUDGEON_1)
 		return
 	if(!force)
 		playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
@@ -54,7 +54,7 @@
 
 //the equivalent of the standard version of attack() but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
-	if(flags & NOBLUDGEON)
+	if(flags_1 & NOBLUDGEON_1)
 		return
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(O)

code/_onclick/telekinesis.dm

@@ -68,7 +68,7 @@
 	desc = "Magic"
 	icon = 'icons/obj/magic.dmi'//Needs sprites
 	icon_state = "2"
-	flags = NOBLUDGEON | ABSTRACT | DROPDEL
+	flags_1 = NOBLUDGEON_1 | ABSTRACT_1 | DROPDEL_1
 	//item_state = null
 	w_class = WEIGHT_CLASS_GIGANTIC
 	layer = ABOVE_HUD_LAYER

code/citadel/dogborgstuff.dm

@@ -3,7 +3,7 @@
 	icon = 'icons/mob/dogborg.dmi'
 	icon_state = "jaws"
 	desc = "The jaws of the law."
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	force = 12
 	throwforce = 0
 	hitsound = 'sound/weapons/bite.ogg'
@@ -16,7 +16,7 @@
 	icon = 'icons/mob/dogborg.dmi'
 	icon_state = "smalljaws"
 	desc = "The jaws of a small dog."
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	force = 6
 	throwforce = 0
 	hitsound = 'sound/weapons/bite.ogg'
@@ -38,7 +38,7 @@
 			icon = 'icons/mob/dogborg.dmi'
 			icon_state = "jaws"
 			desc = "The jaws of the law."
-			flags = CONDUCT
+			flags_1 = CONDUCT_1
 			force = 12
 			throwforce = 0
 			hitsound = 'sound/weapons/bite.ogg'
@@ -50,7 +50,7 @@
 			icon = 'icons/mob/dogborg.dmi'
 			icon_state = "smalljaws"
 			desc = "The jaws of a small dog."
-			flags = CONDUCT
+			flags_1 = CONDUCT_1
 			force = 5
 			throwforce = 0
 			hitsound = 'sound/weapons/bite.ogg'
@@ -85,7 +85,7 @@
 	icon = 'icons/mob/dogborg.dmi'
 	icon_state = "nose"
 	desc = "The BOOP module"
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	force = 0
 	throwforce = 0
 	attack_verb = list("nuzzled", "nosed", "booped")
@@ -177,7 +177,7 @@
 
 /obj/item/weapon/soap/tongue/New()
 	..()
-	flags |= NOBLUDGEON //No more attack messages
+	flags_1 |= NOBLUDGEON_1 //No more attack messages
 
 /obj/item/trash/rkibble
 	name = "robo kibble"
@@ -344,7 +344,7 @@
 
 /obj/item/device/dogborg/sleeper/New()
 	..()
-	flags |= NOBLUDGEON //No more attack messages
+	flags_1 |= NOBLUDGEON_1 //No more attack messages
 
 /obj/item/device/dogborg/sleeper/Exit(atom/movable/O)
 	return 0
@@ -655,7 +655,7 @@
 		cleaning = 0
 		update_patient()
 		return
-	
+
 	//sound effects
 	for(var/mob/living/M in contents)
 		if(prob(20))
@@ -663,7 +663,7 @@
 			playsound(get_turf(hound),"digest_pred",75,0,-6,0,channel=CHANNEL_PRED)
 			M.stop_sound_channel(CHANNEL_PRED)
 			M.playsound_local("digest_prey",60)
-			
+
 	//If the timing is right, and there are items to be touched
 	if(SSmobs.times_fired%6==1 && length(touchable_items))
 
@@ -744,7 +744,7 @@
 
 /obj/item/weapon/storage/attackby(obj/item/device/dogborg/sleeper/K9, mob/user, proximity)
 	K9.afterattack(src, user ,1)
-	
+
 /obj/item/device/dogborg/sleeper/K9/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)
 	hound = loc
 
@@ -775,7 +775,7 @@
 			playsound(hound, 'sound/effects/bin_close.ogg', 80, 1) // Really don't need ERP sound effects for robots
 		return
 	return
-		
+
 /obj/item/device/dogborg/sleeper/compactor //Janihound gut.
 	name = "garbage processor"
 	desc = "A mounted garbage compactor unit with fuel processor."
@@ -854,7 +854,7 @@
 
 /obj/item/weapon/dogborg/pounce/New()
 	..()
-	flags |= NOBLUDGEON
+	flags_1 |= NOBLUDGEON_1
 
 /mob/living/silicon/robot
 	var/leaping = 0

code/controllers/master.dm

@@ -53,7 +53,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
 	var/static/restart_count = 0
-	
+
 	//current tick limit, assigned before running a subsystem.
 	//used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits
 	var/static/current_ticklimit = TICK_LIMIT_RUNNING
@@ -131,7 +131,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 				FireHim = TRUE
 			if(3)
 				msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined."
-				BadBoy.flags |= SS_NO_FIRE
+				BadBoy.flags_1 |= SS_NO_FIRE
 		if(msg)
 			to_chat(GLOB.admins, "<span class='boldannounce'>[msg]</span>")
 			log_world(msg)
@@ -167,7 +167,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	// Initialize subsystems.
 	current_ticklimit = config.tick_limit_mc_init
 	for (var/datum/controller/subsystem/SS in subsystems)
-		if (SS.flags & SS_NO_INIT)
+		if (SS.flags_1 & SS_NO_INIT)
 			continue
 		SS.Initialize(REALTIMEOFDAY)
 		CHECK_TICK
@@ -232,13 +232,13 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/timer = world.time
 	for (var/thing in subsystems)
 		var/datum/controller/subsystem/SS = thing
-		if (SS.flags & SS_NO_FIRE)
+		if (SS.flags_1 & SS_NO_FIRE)
 			continue
 		SS.queued_time = 0
 		SS.queue_next = null
 		SS.queue_prev = null
 		SS.state = SS_IDLE
-		if (SS.flags & SS_TICKER)
+		if (SS.flags_1 & SS_TICKER)
 			tickersubsystems += SS
 			timer += world.tick_lag * rand(1, 5)
 			SS.next_fire = timer
@@ -371,7 +371,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			continue
 		if (SS.next_fire > world.time)
 			continue
-		SS_flags = SS.flags
+		SS_flags = SS.flags_1
 		if (SS_flags & SS_NO_FIRE)
 			subsystemstocheck -= SS
 			continue
@@ -408,7 +408,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			if (ran && world.tick_usage > TICK_LIMIT_RUNNING)
 				break
 
-			queue_node_flags = queue_node.flags
+			queue_node_flags = queue_node.flags_1
 			queue_node_priority = queue_node.queued_priority
 
 			//super special case, subsystems where we can't make them pause mid way through

code/controllers/subsystem.dm

@@ -6,7 +6,7 @@
 	var/wait = 20			//time to wait (in deciseconds) between each call to fire(). Must be a positive integer.
 	var/priority = 50		//When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep
 
-	var/flags = 0			//see MC.dm in __DEFINES Most flags must be set on world start to take full effect. (You can also restart the mc to force them to process again)
+	var/flags_1 = 0			//see MC.dm in __DEFINES Most flags_1 must be set on world start to take full effect. (You can also restart the mc to force them to process again)
 
 	//set to 0 to prevent fire() calls, mostly for admin use or subsystems that may be resumed later
 	//	use the SS_NO_FIRE flag instead for systems that never fire to keep it from even being added to the list
@@ -61,13 +61,13 @@
 //fire() seems more suitable. This is the procedure that gets called every 'wait' deciseconds.
 //Sleeping in here prevents future fires until returned.
 /datum/controller/subsystem/proc/fire(resumed = 0)
-	flags |= SS_NO_FIRE
+	flags_1 |= SS_NO_FIRE
 	throw EXCEPTION("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.")
 
 /datum/controller/subsystem/Destroy()
 	dequeue()
 	can_fire = 0
-	flags |= SS_NO_FIRE
+	flags_1 |= SS_NO_FIRE
 	Master.subsystems -= src
 
 
@@ -76,14 +76,14 @@
 //	(this lets us sort our run order correctly without having to re-sort the entire already sorted list)
 /datum/controller/subsystem/proc/enqueue()
 	var/SS_priority = priority
-	var/SS_flags = flags
+	var/SS_flags = flags_1
 	var/datum/controller/subsystem/queue_node
 	var/queue_node_priority
 	var/queue_node_flags
 
 	for (queue_node = Master.queue_head; queue_node; queue_node = queue_node.queue_next)
 		queue_node_priority = queue_node.queued_priority
-		queue_node_flags = queue_node.flags
+		queue_node_flags = queue_node.flags_1
 
 		if (queue_node_flags & SS_TICKER)
 			if (!(SS_flags & SS_TICKER))
@@ -170,7 +170,7 @@
 
 
 
-	if(can_fire && !(SS_NO_FIRE in flags))
+	if(can_fire && !(SS_NO_FIRE in flags_1))
 		msg = "[round(cost,1)]ms|[round(tick_usage,1)]%([round(tick_overrun,1)]%)|[round(ticks,0.1)]\t[msg]"
 	else
 		msg = "OFFLINE\t[msg]"

code/controllers/subsystem/acid.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(acid)
 	name = "Acid"
 	priority = 40
-	flags = SS_NO_INIT|SS_BACKGROUND
+	flags_1 = SS_NO_INIT|SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/air.dm

@@ -11,7 +11,7 @@ SUBSYSTEM_DEF(air)
 	init_order = INIT_ORDER_AIR
 	priority = 20
 	wait = 5
-	flags = SS_BACKGROUND
+	flags_1 = SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/cost_turfs = 0

code/controllers/subsystem/assets.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(assets)
 	name = "Assets"
 	init_order = INIT_ORDER_ASSETS
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/list/cache = list()
 	var/list/preload = list()
 

code/controllers/subsystem/atoms.dm

@@ -6,7 +6,7 @@
 SUBSYSTEM_DEF(atoms)
 	name = "Atoms"
 	init_order = INIT_ORDER_ATOMS
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/initialized = INITIALIZATION_INSSATOMS
 	var/old_initialized
@@ -30,7 +30,7 @@ SUBSYSTEM_DEF(atoms)
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 
 	LAZYINITLIST(late_loaders)
-	
+
 	var/count
 	var/list/mapload_arg = list(TRUE)
 	if(atoms)
@@ -60,10 +60,10 @@ SUBSYSTEM_DEF(atoms)
 			A.LateInitialize()
 		testing("Late initialized [late_loaders.len] atoms")
 		late_loaders.Cut()
-	
+
 	if(atoms)
 		. = created_atoms + atoms
-		created_atoms = null 
+		created_atoms = null
 
 /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments)
 	var/the_type = A.type
@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(atoms)
 
 	if(start_tick != world.time)
 		BadInitializeCalls[the_type] |= BAD_INIT_SLEPT
-	
+
 	var/qdeleted = FALSE
 
 	if(result != INITIALIZE_HINT_NORMAL)
@@ -92,12 +92,12 @@ SUBSYSTEM_DEF(atoms)
 				qdeleted = TRUE
 			else
 				BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT
-				
+
 	if(!A)	//possible harddel
 		qdeleted = TRUE
 	else if(!A.initialized)
 		BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT
-	
+
 	return qdeleted || QDELING(A)
 
 /datum/controller/subsystem/atoms/proc/map_loader_begin()

code/controllers/subsystem/augury.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(augury)
 	name = "Augury"
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/watchers = list()

code/controllers/subsystem/blackbox.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(blackbox)
 	name = "Blackbox"
 	wait = 6000
-	flags = SS_NO_TICK_CHECK | SS_NO_INIT
+	flags_1 = SS_NO_TICK_CHECK | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 	init_order = INIT_ORDER_BLACKBOX
 
@@ -250,7 +250,7 @@ SUBSYSTEM_DEF(blackbox)
 		return 0
 	return value
 
-/datum/feedback_variable/proc/get_variable()
+/datum/feedback_variable/proc/get_variable()
 	return variable
 
 /datum/feedback_variable/proc/set_details(text)
@@ -260,11 +260,11 @@ SUBSYSTEM_DEF(blackbox)
 /datum/feedback_variable/proc/add_details(text)
 	if (istext(text))
 		if (!details)
-			details = "\"[text]\""
+			details = "\"[text]\""
 		else
-			details += " | \"[text]\""
+			details += " | \"[text]\""
 
-/datum/feedback_variable/proc/get_details()
+/datum/feedback_variable/proc/get_details()
 	return details
 
 /datum/feedback_variable/proc/get_parsed()

code/controllers/subsystem/communications.dm

@@ -3,7 +3,7 @@
 
 SUBSYSTEM_DEF(communications)
 	name = "Communications"
-	flags = SS_NO_INIT | SS_NO_FIRE
+	flags_1 = SS_NO_INIT | SS_NO_FIRE
 
 	var/silicon_message_cooldown
 	var/nonsilicon_message_cooldown

code/controllers/subsystem/dbcore.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(dbcore)
 	name = "Database"
-	flags = SS_NO_INIT|SS_NO_FIRE
+	flags_1 = SS_NO_INIT|SS_NO_FIRE
 	init_order = INIT_ORDER_DBCORE
 	var/const/FAILED_DB_CONNECTION_CUTOFF = 5
 
@@ -251,7 +251,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
 	var/table
 	var/position //1-based index into item data
 	var/sql_type
-	var/flags
+	var/flags_1
 	var/length
 	var/max_length
 	//types
@@ -275,7 +275,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
 	table = table_handler
 	position = position_handler
 	sql_type = type_handler
-	flags = flag_handler
+	flags_1 = flag_handler
 	length = length_handler
 	max_length = max_length_handler
 

code/controllers/subsystem/disease.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(disease)
 	name = "Disease"
-	flags = SS_NO_FIRE | SS_NO_INIT
+	flags_1 = SS_NO_FIRE | SS_NO_INIT
 
 	var/list/active_diseases = list() //List of Active disease in all mobs; purely for quick referencing.
 	var/list/diseases

code/controllers/subsystem/explosion.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(explosion)
 	priority = 99
 	wait = 1
-	flags = SS_TICKER|SS_NO_INIT
+	flags_1 = SS_TICKER|SS_NO_INIT
 
 	var/list/explosions
 
@@ -49,12 +49,12 @@ SUBSYSTEM_DEF(explosion)
 	flame_cap = SSexplosion.flame_cap
 	dyn_ex_scale = SSexplosion.dyn_ex_scale
 
-/datum/controller/subsystem/explosion/fire()    
+/datum/controller/subsystem/explosion/fire()
 	var/list/cached_explosions = explosions
 	var/num_explosions = cached_explosions.len
 	if(!num_explosions)
 		return
-	
+
 	//figure exactly how many tick splits are required
 	var/num_splits
 	if(rebuild_tick_split_count)
@@ -216,7 +216,7 @@ SUBSYSTEM_DEF(explosion)
 
 	started_at = REALTIMEOFDAY
 	tick_started = world.time
-	
+
 	gathered_turfs = list()
 	calculated_turfs = list()
 	unsafe_turfs = list()
@@ -332,13 +332,13 @@ SUBSYSTEM_DEF(explosion)
 
 		for(var/obj/structure/blob/B in T)
 			current_exp_block += B.explosion_block
-		
+
 		L[T] = current_exp_block
 
 		if(MC_TICK_CHECK)
 			E.gathered_turfs.Cut(1, cut_to)
 			return FALSE
-	
+
 	E.gathered_turfs.Cut()
 	return done_gathering_turfs
 
@@ -358,7 +358,7 @@ SUBSYSTEM_DEF(explosion)
 	var/throw_range_max = E.extent
 
 	var/turf/epi = E.epicenter
-	
+
 	var/x0 = epi.x
 	var/y0 = epi.y
 
@@ -407,7 +407,7 @@ SUBSYSTEM_DEF(explosion)
 				var/throw_range = rand(throw_dist, throw_range_max)
 				var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
 				I.throw_speed = 4 //Temporarily change their throw_speed for embedding purposes (Resets when it finishes throwing, regardless of hitting anything)
-				I.throw_at(throw_at, throw_range, 4)		
+				I.throw_at(throw_at, throw_range, 4)
 
 		if(MC_TICK_CHECK)
 			var/circumference = (PI * (init_dist + 4) * 2) //+4 to radius to prevent shit gaps
@@ -432,7 +432,7 @@ SUBSYSTEM_DEF(explosion)
 
 	E.finished_at = REALTIMEOFDAY
 	E.tick_finished = world.time
-	
+
 	return TRUE
 
 /client/proc/check_bomb_impacts()

code/controllers/subsystem/fire_burning.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(fire_burning)
 	name = "Fire Burning"
 	priority = 40
-	flags = SS_NO_INIT|SS_BACKGROUND
+	flags_1 = SS_NO_INIT|SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/garbage.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(garbage)
 	name = "Garbage"
 	priority = 15
 	wait = 5
-	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
+	flags_1 = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 
 	var/collection_timeout = 3000// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object
@@ -67,9 +67,9 @@ SUBSYSTEM_DEF(garbage)
 	HandleToBeQueued()
 	if(state == SS_RUNNING)
 		HandleQueue()
-	
+
 	if (state == SS_PAUSED) //make us wait again before the next run.
-		state = SS_RUNNING 
+		state = SS_RUNNING
 
 //If you see this proc high on the profile, what you are really seeing is the garbage collection/soft delete overhead in byond.
 //Don't attempt to optimize, not worth the effort.
@@ -114,7 +114,7 @@ SUBSYSTEM_DEF(garbage)
 			var/type = A.type
 			testing("GC: -- \ref[A] | [type] was unable to be GC'd and was deleted --")
 			didntgc["[type]"]++
-			
+
 			HardDelete(A)
 
 			++delslasttick
@@ -149,12 +149,12 @@ SUBSYSTEM_DEF(garbage)
 	var/time = world.timeofday
 	var/tick = world.tick_usage
 	var/ticktime = world.time
-	
+
 	var/type = A.type
 	var/refID = "\ref[A]"
-	
+
 	del(A)
-	
+
 	tick = (world.tick_usage-tick+((world.time-ticktime)/world.tick_lag*100))
 	if (tick > highest_del_tickusage)
 		highest_del_tickusage = tick
@@ -167,7 +167,7 @@ SUBSYSTEM_DEF(garbage)
 		log_game("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete)")
 		message_admins("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete).")
 		postpone(time/5)
-	
+
 /datum/controller/subsystem/garbage/proc/HardQueue(datum/A)
 	if (istype(A) && A.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
 		tobequeued += A

code/controllers/subsystem/icon_smooth.dm

@@ -3,7 +3,7 @@ SUBSYSTEM_DEF(icon_smooth)
 	init_order = INIT_ORDER_ICON_SMOOTHING
 	wait = 1
 	priority = 35
-	flags = SS_TICKER
+	flags_1 = SS_TICKER
 
 	var/list/smooth_queue = list()
 

code/controllers/subsystem/inbounds.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(inbounds)
 	name = "Inbounds"
 	priority = 40
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 	runlevels = RUNLEVEL_GAME
 
 	var/list/processing = list()

code/controllers/subsystem/ipintel.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(ipintel)
 	name = "XKeyScore"
 	init_order = INIT_ORDER_XKEYSCORE
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/enabled = 0 //disable at round start to avoid checking reconnects
 	var/throttle = 0
 	var/errors = 0

code/controllers/subsystem/job.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(job)
 	name = "Jobs"
 	init_order = INIT_ORDER_JOBS
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/occupations = list()		//List of all jobs
 	var/list/name_occupations = list()	//Dict of all jobs, keys are titles

code/controllers/subsystem/language.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(language)
 	name = "Language"
 	init_order = INIT_ORDER_LANGUAGE
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 /datum/controller/subsystem/language/Initialize(timeofday)
 	for(var/L in subtypesof(/datum/language))

code/controllers/subsystem/lighting.dm

@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(lighting)
 	name = "Lighting"
 	wait = 2
 	init_order = INIT_ORDER_LIGHTING
-	flags = SS_TICKER
+	flags_1 = SS_TICKER
 
 	var/initialized = FALSE
 
@@ -24,7 +24,7 @@ SUBSYSTEM_DEF(lighting)
 
 		create_all_lighting_objects()
 		initialized = TRUE
-	
+
 	fire(FALSE, TRUE)
 
 	..()

code/controllers/subsystem/machines.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(machines)
 	name = "Machines"
 	init_order = INIT_ORDER_MACHINES
-	flags = SS_KEEP_TIMING
+	flags_1 = SS_KEEP_TIMING
 	var/list/processing = list()
 	var/list/currentrun = list()
 	var/list/powernets = list()

code/controllers/subsystem/mapping.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(mapping)
 	name = "Mapping"
 	init_order = INIT_ORDER_MAPPING
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/nuke_tiles = list()
 	var/list/nuke_threats = list()
@@ -84,7 +84,7 @@ SUBSYSTEM_DEF(mapping)
 		C.update_icon()
 
 /datum/controller/subsystem/mapping/Recover()
-	flags |= SS_NO_INIT
+	flags_1 |= SS_NO_INIT
 	map_templates = SSmapping.map_templates
 	ruins_templates = SSmapping.ruins_templates
 	space_ruins_templates = SSmapping.space_ruins_templates

code/controllers/subsystem/minimap.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(minimap)
 	name = "Minimap"
 	init_order = INIT_ORDER_MINIMAP
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/const/MINIMAP_SIZE = 2048
 	var/const/TILE_SIZE = 8
 

code/controllers/subsystem/mobs.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(mobs)
 	name = "Mobs"
 	priority = 100
-	flags = SS_KEEP_TIMING|SS_NO_INIT
+	flags_1 = SS_KEEP_TIMING|SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/npcpool.dm

@@ -5,7 +5,7 @@
 
 SUBSYSTEM_DEF(npcpool)
 	name = "NPC Pool"
-	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
+	flags_1 = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
 	priority = 20
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
@@ -134,12 +134,12 @@ SUBSYSTEM_DEF(npcpool)
 
 		if(facCount == 1 && helpProb)
 			helpProb = 100
-	
+
 		if(prob(helpProb) && candidate.takeDelegate(check,FALSE))
 			--canBeUsed.len
 			candidate.eye_color = "yellow"
 			candidate.update_icons()
-			
+
 		if(!currentrun.len || MC_TICK_CHECK)	//don't change SS state if it isn't necessary
 			return
 

code/controllers/subsystem/orbit.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(orbit)
 	name = "Orbits"
 	priority = 35
 	wait = 2
-	flags = SS_NO_INIT|SS_TICKER
+	flags_1 = SS_NO_INIT|SS_TICKER
 
 	var/list/currentrun = list()
 	var/list/processing = list()

code/controllers/subsystem/pai.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(pai)
 	name = "pAI"
 
-	flags = SS_NO_INIT|SS_NO_FIRE
+	flags_1 = SS_NO_INIT|SS_NO_FIRE
 
 	var/list/candidates = list()
 	var/ghost_spam = FALSE

code/controllers/subsystem/parallax.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(parallax)
 	name = "Parallax"
 	wait = 2
-	flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT
+	flags_1 = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT
 	priority = 65
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	var/list/currentrun

code/controllers/subsystem/persistence.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
 	init_order = INIT_ORDER_PERSISTENCE
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/savefile/secret_satchels
 	var/list/satchel_blacklist 		= list() //this is a typecache
 	var/list/new_secret_satchels 	= list() //these are objects

code/controllers/subsystem/ping.dm

@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(ping)
 	name = "Ping"
 	wait = 6
-	flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
+	flags_1 = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
 	priority = 10
 	var/list/currentrun
 

code/controllers/subsystem/processing/fields.dm

@@ -2,5 +2,5 @@ PROCESSING_SUBSYSTEM_DEF(fields)
 	name = "Fields"
 	wait = 2
 	priority = 40
-	flags = SS_KEEP_TIMING | SS_NO_INIT
+	flags_1 = SS_KEEP_TIMING | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

code/controllers/subsystem/processing/flightpacks.dm

@@ -3,7 +3,7 @@ PROCESSING_SUBSYSTEM_DEF(flightpacks)
 	priority = 30
 	wait = 2
 	stat_tag = "FM"
-	flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
+	flags_1 = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
 
 	var/flightsuit_processing = FLIGHTSUIT_PROCESSING_FULL
 

code/controllers/subsystem/processing/obj.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(obj)
 	name = "Objects"
 	priority = 40
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 
 	var/list/processing = list()
 	var/list/currentrun = list()

code/controllers/subsystem/processing/overlays.dm

@@ -1,6 +1,6 @@
 PROCESSING_SUBSYSTEM_DEF(overlays)
 	name = "Overlay"
-	flags = SS_TICKER
+	flags_1 = SS_TICKER
 	wait = 1
 	priority = 500
 	init_order = INIT_ORDER_OVERLAY
@@ -55,7 +55,7 @@ PROCESSING_SUBSYSTEM_DEF(overlays)
 		overlays = po
 	else
 		overlays.Cut()
-	flags &= ~OVERLAY_QUEUED
+	flags_1 &= ~OVERLAY_QUEUED_1
 
 /proc/iconstate2appearance(icon, iconstate)
 	var/static/image/stringbro = new()
@@ -102,8 +102,8 @@ PROCESSING_SUBSYSTEM_DEF(overlays)
 			new_overlays[i] = appearance_bro.appearance
 	return new_overlays
 
-#define NOT_QUEUED_ALREADY (!(flags & OVERLAY_QUEUED))
-#define QUEUE_FOR_COMPILE flags |= OVERLAY_QUEUED; SSoverlays.processing += src;
+#define NOT_QUEUED_ALREADY (!(flags_1 & OVERLAY_QUEUED_1))
+#define QUEUE_FOR_COMPILE flags_1 |= OVERLAY_QUEUED_1; SSoverlays.processing += src;
 /atom/proc/cut_overlays(priority = FALSE)
 	var/list/cached_overlays = our_overlays
 	var/list/cached_priority = priority_overlays

code/controllers/subsystem/processing/processing.dm

@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(processing)
 	name = "Processing"
 	priority = 25
-	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
+	flags_1 = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
 	wait = 10
 
 	var/stat_tag = "P" //Used for logging

code/controllers/subsystem/radio.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(radio)
 	name = "Radio"
-	flags = SS_NO_FIRE|SS_NO_INIT
+	flags_1 = SS_NO_FIRE|SS_NO_INIT
 
 	var/list/datum/radio_frequency/frequencies = list()
 

code/controllers/subsystem/religion.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(religion)
 	name = "Religion"
-	flags = SS_NO_FIRE|SS_NO_INIT
+	flags_1 = SS_NO_FIRE|SS_NO_INIT
 
 	var/religion
 	var/deity

code/controllers/subsystem/server_maint.dm

@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(server_maint)
 	name = "Server Tasks"
 	wait = 6
-	flags = SS_POST_FIRE_TIMING
+	flags_1 = SS_POST_FIRE_TIMING
 	priority = 10
 	init_order = INIT_ORDER_SERVER_MAINT
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT

code/controllers/subsystem/shuttle.dm

@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(shuttle)
 	name = "Shuttle"
 	wait = 10
 	init_order = INIT_ORDER_SHUTTLE
-	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
+	flags_1 = SS_KEEP_TIMING|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME
 
 	var/list/mobile = list()
@@ -84,7 +84,7 @@ SUBSYSTEM_DEF(shuttle)
 		var/turf/T = i
 		T.ChangeTurf(/turf/open/space)
 		transit_turfs += T
-		T.flags |= UNUSED_TRANSIT_TURF
+		T.flags_1 |= UNUSED_TRANSIT_TURF_1
 
 #ifdef HIGHLIGHT_DYNAMIC_TRANSIT
 /datum/controller/subsystem/shuttle/proc/color_space()
@@ -412,13 +412,13 @@ SUBSYSTEM_DEF(shuttle)
 		for(var/i in transit_turfs)
 			CHECK_TICK
 			var/turf/topleft = i
-			if(!(topleft.flags & UNUSED_TRANSIT_TURF))
+			if(!(topleft.flags_1 & UNUSED_TRANSIT_TURF_1))
 				continue
 			var/turf/bottomright = locate(topleft.x + transit_width,
 				topleft.y + transit_height, topleft.z)
 			if(!bottomright)
 				continue
-			if(!(bottomright.flags & UNUSED_TRANSIT_TURF))
+			if(!(bottomright.flags_1 & UNUSED_TRANSIT_TURF_1))
 				continue
 
 			proposed_zone = block(topleft, bottomright)
@@ -428,7 +428,7 @@ SUBSYSTEM_DEF(shuttle)
 				var/turf/T = j
 				if(!T)
 					continue base
-				if(!(T.flags & UNUSED_TRANSIT_TURF))
+				if(!(T.flags_1 & UNUSED_TRANSIT_TURF_1))
 					continue base
 			//to_chat(world, "[COORD(topleft)] and [COORD(bottomright)]")
 			break base
@@ -500,7 +500,7 @@ SUBSYSTEM_DEF(shuttle)
 	for(var/i in new_transit_dock.assigned_turfs)
 		var/turf/T = i
 		T.ChangeTurf(transit_path)
-		T.flags &= ~(UNUSED_TRANSIT_TURF)
+		T.flags_1 &= ~(UNUSED_TRANSIT_TURF_1)
 
 	M.assigned_transit = new_transit_dock
 	return TRUE

code/controllers/subsystem/spacedrift.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(spacedrift)
 	name = "Space Drift"
 	priority = 30
 	wait = 5
-	flags = SS_NO_INIT|SS_KEEP_TIMING
+	flags_1 = SS_NO_INIT|SS_KEEP_TIMING
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/squeak.dm

@@ -5,7 +5,7 @@
 SUBSYSTEM_DEF(squeak)
 	name = "Squeak"
 	init_order = INIT_ORDER_SQUEAK
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/exposed_wires = list()
 

code/controllers/subsystem/stickyban.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(stickyban)
 	name = "Sticky Ban"
 	init_order = INIT_ORDER_STICKY_BAN
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/cache = list()
 
@@ -27,6 +27,6 @@ SUBSYSTEM_DEF(stickyban)
 		ban["existing_user_matches_this_round"] = list()
 		ban["admin_matches_this_round"] = list()
 		cache[ckey] = ban
-	
+
 	for (var/bannedckey in cache)
 		world.SetConfig("ban", bannedckey, list2stickyban(cache[bannedckey]))

code/controllers/subsystem/sun.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(sun)
 	name = "Sun"
 	wait = 600
-	flags = SS_NO_TICK_CHECK|SS_NO_INIT
+	flags_1 = SS_NO_TICK_CHECK|SS_NO_INIT
 	var/angle
 	var/dx
 	var/dy

code/controllers/subsystem/tgui.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(tgui)
 	name = "tgui"
 	wait = 9
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 	priority = 110
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 

code/controllers/subsystem/throwing.dm

@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(throwing)
 	name = "Throwing"
 	priority = 25
 	wait = 1
-	flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER
+	flags_1 = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun
@@ -135,6 +135,6 @@ SUBSYSTEM_DEF(throwing)
 		var/atom/movable/AM = thing
 		if (AM == thrownthing)
 			continue
-		if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags & ON_BORDER))
+		if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1))
 			finalize(hit=TRUE, target=AM)
 			return TRUE

code/controllers/subsystem/ticker.dm

@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(ticker)
 	init_order = INIT_ORDER_TICKER
 
 	priority = 200
-	flags = SS_KEEP_TIMING
+	flags_1 = SS_KEEP_TIMING
 	runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME
 
 	var/current_state = GAME_STATE_STARTUP	//state of current round (used by process()) Use the defines GAME_STATE_* !

code/controllers/subsystem/time_track.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(time_track)
 	name = "Time Tracking"
 	wait = 600
-	flags = SS_NO_INIT|SS_NO_TICK_CHECK
+	flags_1 = SS_NO_INIT|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 
 	var/time_dilation_current = 0

code/controllers/subsystem/timer.dm

@@ -7,7 +7,7 @@ SUBSYSTEM_DEF(timer)
 	wait = 1 //SS_TICKER subsystem, so wait is in ticks
 	init_order = INIT_ORDER_TIMER
 
-	flags = SS_TICKER|SS_NO_INIT
+	flags_1 = SS_TICKER|SS_NO_INIT
 
 	var/list/datum/timedevent/processing = list()
 	var/list/hashes = list()
@@ -50,9 +50,9 @@ SUBSYSTEM_DEF(timer)
 			var/datum/timedevent/bucket_head = bucket_list[i]
 			if (!bucket_head)
 				continue
-				
+
 			log_world("Active timers at index [i]:")
-			
+
 			var/datum/timedevent/bucket_node = bucket_head
 			var/anti_loop_check = 1000
 			do
@@ -215,7 +215,7 @@ SUBSYSTEM_DEF(timer)
 	var/datum/callback/callBack
 	var/timeToRun
 	var/hash
-	var/list/flags
+	var/list/flags_1
 	var/spent = FALSE //set to true right before running.
 	var/name //for easy debugging.
 	//cicular doublely linked list
@@ -224,16 +224,16 @@ SUBSYSTEM_DEF(timer)
 
 	var/static/nextid = 1
 
-/datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash)
+/datum/timedevent/New(datum/callback/callBack, timeToRun, flags_1, hash)
 	id = TIMER_ID_NULL
 	src.callBack = callBack
 	src.timeToRun = timeToRun
-	src.flags = flags
+	src.flags_1 = flags_1
 	src.hash = hash
-	
-	if (flags & TIMER_UNIQUE)
+
+	if (flags_1 & TIMER_UNIQUE)
 		SStimer.hashes[hash] = src
-	if (flags & TIMER_STOPPABLE)
+	if (flags_1 & TIMER_STOPPABLE)
 		do
 			if (nextid >= TIMER_ID_MAX)
 				nextid = 1
@@ -241,12 +241,12 @@ SUBSYSTEM_DEF(timer)
 		while(SStimer.timer_id_dict["timerid" + num2text(id, 8)])
 		SStimer.timer_id_dict["timerid" + num2text(id, 8)] = src
 
-	name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])"
+	name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags_1, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])"
 
 	if (callBack.object != GLOBAL_PROC)
 		LAZYADD(callBack.object.active_timers, src)
 
-	if (flags & TIMER_CLIENT_TIME)
+	if (flags_1 & TIMER_CLIENT_TIME)
 		//sorted insert
 		var/list/ctts = SStimer.clienttime_timers
 		var/cttl = length(ctts)
@@ -291,7 +291,7 @@ SUBSYSTEM_DEF(timer)
 
 /datum/timedevent/Destroy()
 	..()
-	if (flags & TIMER_UNIQUE)
+	if (flags_1 & TIMER_UNIQUE)
 		SStimer.hashes -= hash
 
 
@@ -301,10 +301,10 @@ SUBSYSTEM_DEF(timer)
 
 	callBack = null
 
-	if (flags & TIMER_STOPPABLE)
+	if (flags_1 & TIMER_STOPPABLE)
 		SStimer.timer_id_dict -= "timerid" + num2text(id, 8)
 
-	if (flags & TIMER_CLIENT_TIME)
+	if (flags_1 & TIMER_CLIENT_TIME)
 		SStimer.clienttime_timers -= src
 		return QDEL_HINT_IWILLGC
 
@@ -346,7 +346,7 @@ SUBSYSTEM_DEF(timer)
 	else
 		. = "[callBack.object.type]"
 
-/proc/addtimer(datum/callback/callback, wait, flags)
+/proc/addtimer(datum/callback/callback, wait, flags_1)
 	if (!callback)
 		return
 
@@ -354,12 +354,12 @@ SUBSYSTEM_DEF(timer)
 
 	var/hash
 
-	if (flags & TIMER_UNIQUE)
+	if (flags_1 & TIMER_UNIQUE)
 		var/list/hashlist
-		if(flags & TIMER_NO_HASH_WAIT)
-			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags & TIMER_CLIENT_TIME)
+		if(flags_1 & TIMER_NO_HASH_WAIT)
+			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags_1 & TIMER_CLIENT_TIME)
 		else
-			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags & TIMER_CLIENT_TIME)
+			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags_1 & TIMER_CLIENT_TIME)
 		hashlist += callback.arguments
 		hash = hashlist.Join("|||||||")
 
@@ -370,20 +370,20 @@ SUBSYSTEM_DEF(timer)
 				SStimer.hashes -= hash
 			else
 
-				if (flags & TIMER_OVERRIDE)
+				if (flags_1 & TIMER_OVERRIDE)
 					qdel(hash_timer)
 				else
-					if (hash_timer.flags & TIMER_STOPPABLE)
+					if (hash_timer.flags_1 & TIMER_STOPPABLE)
 						. = hash_timer.id
 					return
 
 
 	var/timeToRun = world.time + wait
-	if (flags & TIMER_CLIENT_TIME)
+	if (flags_1 & TIMER_CLIENT_TIME)
 		timeToRun = REALTIMEOFDAY + wait
 
-	var/datum/timedevent/timer = new(callback, timeToRun, flags, hash)
-	return timer.id 
+	var/datum/timedevent/timer = new(callback, timeToRun, flags_1, hash)
+	return timer.id
 
 /proc/deltimer(id)
 	if (!id)

code/controllers/subsystem/title.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(title)
 	name = "Title Screen"
-	flags = SS_NO_FIRE|SS_NO_INIT
+	flags_1 = SS_NO_FIRE|SS_NO_INIT
 
 	var/file_path
 	var/icon/icon
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(title)
 				break
 
 		file_path = "config/title_screens/images/[pick(title_screens)]"
-		
+
 		icon = new(fcopy_rsc(file_path))
 
 		if(splash_turf)

code/controllers/subsystem/vote.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(vote)
 	name = "Vote"
 	wait = 10
 
-	flags = SS_KEEP_TIMING|SS_NO_INIT
+	flags_1 = SS_KEEP_TIMING|SS_NO_INIT
 
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 

code/controllers/subsystem/weather.dm

@@ -1,7 +1,7 @@
 //Used for all kinds of weather, ex. lavaland ash storms.
 SUBSYSTEM_DEF(weather)
 	name = "Weather"
-	flags = SS_BACKGROUND
+	flags_1 = SS_BACKGROUND
 	wait = 10
 	runlevels = RUNLEVEL_GAME
 	var/list/processing = list()

code/datums/diseases/magnitis.dm

@@ -19,7 +19,7 @@
 				to_chat(affected_mob, "<span class='danger'>You feel a slight shock course through your body.</span>")
 			if(prob(2))
 				for(var/obj/M in orange(2,affected_mob))
-					if(!M.anchored && (M.flags & CONDUCT))
+					if(!M.anchored && (M.flags_1 & CONDUCT_1))
 						step_towards(M,affected_mob)
 				for(var/mob/living/silicon/S in orange(2,affected_mob))
 					if(isAI(S))
@@ -32,7 +32,7 @@
 				to_chat(affected_mob, "<span class='danger'>You feel like clowning around.</span>")
 			if(prob(4))
 				for(var/obj/M in orange(4,affected_mob))
-					if(!M.anchored && (M.flags & CONDUCT))
+					if(!M.anchored && (M.flags_1 & CONDUCT_1))
 						var/i
 						var/iter = rand(1,2)
 						for(i=0,i<iter,i++)
@@ -51,7 +51,7 @@
 				to_chat(affected_mob, "<span class='danger'>You query upon the nature of miracles.</span>")
 			if(prob(8))
 				for(var/obj/M in orange(6,affected_mob))
-					if(!M.anchored && (M.flags & CONDUCT))
+					if(!M.anchored && (M.flags_1 & CONDUCT_1))
 						var/i
 						var/iter = rand(1,3)
 						for(i=0,i<iter,i++)

code/datums/riding.dm

@@ -419,7 +419,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "offhand"
 	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | DROPDEL | NOBLUDGEON
+	flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	var/mob/living/carbon/rider
 	var/mob/living/ridden

code/datums/riding.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/datums/riding.dm b/code/datums/riding.dm	(rejected hunks)
+@@ -419,7 +419,7 @@
+ 	icon = 'icons/obj/items_and_weapons.dmi'
+ 	icon_state = "offhand"
+ 	w_class = WEIGHT_CLASS_HUGE
+-	flags = ABSTRACT | DROPDEL | NOBLUDGEON
++	flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
+ 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ 	var/mob/living/carbon/rider
+ 	var/mob/living/ridden

code/game/area/Space_Station_13_areas.dm.rej

@@ -0,0 +1,29 @@
+diff a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm	(rejected hunks)
+@@ -535,15 +535,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
+ /area/crew_quarters/toilet/fitness
+ 	name = "Fitness Toilets"
+ 	icon_state = "toilet"
+-	
++
+ /area/crew_quarters/toilet/female
+ 	name = "Female Toilets"
+ 	icon_state = "toilet"
+-	
++
+ /area/crew_quarters/toilet/male
+ 	name = "Male Toilets"
+ 	icon_state = "toilet"
+-	
++
+ /area/crew_quarters/toilet/restrooms
+ 	name = "Restrooms"
+ 	icon_state = "toilet"
+@@ -1009,7 +1009,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
+ 
+ /area/security/execution/transfer
+ 	name = "Transfer Centre"
+-	
++
+ /area/security/execution/education
+ 	name = "Prisoner Education Chamber"
+ 

code/game/area/areas.dm

@@ -58,7 +58,7 @@
 									'sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg',\
 									'sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg',\
 									'sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
-	flags = CAN_BE_DIRTY
+	flags_1 = CAN_BE_DIRTY_1
 
 	var/list/firedoors
 	var/firedoors_last_closed_on = 0

code/game/area/areas/centcom.dm

@@ -9,7 +9,7 @@
 	has_gravity = TRUE
 	noteleport = TRUE
 	blob_allowed = FALSE //Should go without saying, no blobs should take over centcom as a win condition.
-	flags = NONE
+	flags_1 = NONE
 
 /area/centcom/control
 	name = "CentCom Docks"
@@ -37,7 +37,7 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	requires_power = FALSE
 	has_gravity = TRUE
-	flags = NONE
+	flags_1 = NONE
 
 /area/tdome/arena
 	name = "Thunderdome Arena"
@@ -76,7 +76,7 @@
 	requires_power = FALSE
 	has_gravity = TRUE
 	noteleport = TRUE
-	flags = NONE
+	flags_1 = NONE
 
 //Abductors
 /area/abductor_ship
@@ -85,7 +85,7 @@
 	requires_power = FALSE
 	noteleport = TRUE
 	has_gravity = TRUE
-	flags = NONE
+	flags_1 = NONE
 
 //Syndicates
 /area/syndicate_mothership
@@ -95,7 +95,7 @@
 	has_gravity = TRUE
 	noteleport = TRUE
 	blob_allowed = FALSE //Not... entirely sure this will ever come up... but if the bus makes blobs AND ops, it shouldn't aim for the ops to win.
-	flags = NONE
+	flags_1 = NONE
 
 /area/syndicate_mothership/control
 	name = "Syndicate Control Room"
@@ -115,7 +115,7 @@
 	icon_state = "yellow"
 	requires_power = FALSE
 	has_gravity = TRUE
-	flags = NO_DEATHRATTLE
+	flags_1 = NO_DEATHRATTLE_1
 
 /area/ctf/control_room
 	name = "Control Room A"

code/game/area/areas/holodeck.dm

@@ -2,7 +2,7 @@
 	name = "Holodeck"
 	icon_state = "Holodeck"
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-	flags = 0
+	flags_1 = 0
 	hidden = TRUE
 
 	var/obj/machinery/computer/holodeck/linked

code/game/area/areas/mining.dm

@@ -16,7 +16,7 @@
 	power_light = FALSE
 	outdoors = TRUE
 	ambientsounds = list('sound/ambience/ambimine.ogg')
-	flags = NONE
+	flags_1 = NONE
 
 /area/mine/unexplored
 	name = "Mine"
@@ -30,7 +30,7 @@
 	power_light = FALSE
 	outdoors = TRUE
 	ambientsounds = list('sound/ambience/ambimine.ogg')
-	flags = NONE
+	flags_1 = NONE
 
 /area/mine/lobby
 	name = "Mining Station"
@@ -86,7 +86,7 @@
 /area/lavaland
 	icon_state = "mining"
 	has_gravity = TRUE
-	flags = NONE
+	flags_1 = NONE
 
 /area/lavaland/surface
 	name = "Lavaland"

code/game/atoms.dm

@@ -3,8 +3,8 @@
 	plane = GAME_PLANE
 	var/level = 2
 
-	var/flags = 0
-	var/list/secondary_flags
+	var/flags_1 = 0
+	var/flags_2 = 0
 
 	var/list/fingerprints
 	var/list/fingerprintshidden
@@ -193,23 +193,23 @@
 // returns true if open
 // false if closed
 /atom/proc/is_open_container()
-	return container_type & OPENCONTAINER
+	return container_type & OPENCONTAINER_1
 
 /atom/proc/is_transparent()
-	return container_type & TRANSPARENT
+	return container_type & TRANSPARENT_1
 
 /atom/proc/is_injectable(allowmobs = TRUE)
 	if(isliving(src) && allowmobs)
 		var/mob/living/L = src
 		return L.can_inject()
-	if(container_type & OPENCONTAINER)
+	if(container_type & OPENCONTAINER_1)
 		return TRUE
-	return container_type & INJECTABLE
+	return container_type & INJECTABLE_1
 
 /atom/proc/is_drawable(allowmobs = TRUE)
 	if(is_injectable(allowmobs)) //Everything that can be injected can also be drawn from, but not vice versa
 		return TRUE
-	return container_type & DRAWABLE
+	return container_type & DRAWABLE_1
 
 /atom/proc/allow_drop()
 	return 1
@@ -221,7 +221,7 @@
 	return
 
 /atom/proc/emp_act(severity)
-	if(istype(wires) && !HAS_SECONDARY_FLAG(src, NO_EMP_WIRES))
+	if(istype(wires) && !(flags_2 & NO_EMP_WIRES_2))
 		wires.emp_pulse()
 
 /atom/proc/bullet_act(obj/item/projectile/P, def_zone)

code/game/atoms_movable.dm

@@ -137,7 +137,7 @@
 	if (orbiting)
 		orbiting.Check()
 
-	if(flags & CLEAN_ON_MOVE)
+	if(flags_1 & CLEAN_ON_MOVE_1)
 		clean_on_move()
 
 	var/datum/proximity_monitor/proximity_monitor = src.proximity_monitor
@@ -176,8 +176,8 @@
 					to_chat(cleaned_human, "<span class='danger'>[src] cleans your face!</span>")
 
 /atom/movable/Destroy(force)
-	var/inform_admins = HAS_SECONDARY_FLAG(src, INFORM_ADMINS_ON_RELOCATE)
-	var/stationloving = HAS_SECONDARY_FLAG(src, STATIONLOVING)
+	var/inform_admins = (flags_2 & INFORM_ADMINS_ON_RELOCATE_2)
+	var/stationloving = (flags_2 & STATIONLOVING_2)
 
 	if(inform_admins && force)
 		var/turf/T = get_turf(src)
@@ -221,7 +221,7 @@
 //This is tg's equivalent to the byond bump, it used to be called bump with a second arg
 //to differentiate it, naturally everyone forgot about this immediately and so some things
 //would bump twice, so now it's called Collide
-/atom/movable/proc/Collide(atom/A)	
+/atom/movable/proc/Collide(atom/A)
 	if((A))
 		if(throwing)
 			throwing.hit_atom(A)
@@ -323,7 +323,7 @@
 	..()
 
 /atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback)
-	if (!target || (flags & NODROP) || speed <= 0)
+	if (!target || (flags_1 & NODROP_1) || speed <= 0)
 		return
 
 	if (pulledby)
@@ -550,21 +550,21 @@
 */
 
 /atom/movable/proc/set_stationloving(state, inform_admins=FALSE)
-	var/currently = HAS_SECONDARY_FLAG(src, STATIONLOVING)
+	var/currently = (flags_2 & STATIONLOVING_2)
 
 	if(inform_admins)
-		SET_SECONDARY_FLAG(src, INFORM_ADMINS_ON_RELOCATE)
+		flags_2 |= INFORM_ADMINS_ON_RELOCATE_2
 	else
-		CLEAR_SECONDARY_FLAG(src, INFORM_ADMINS_ON_RELOCATE)
+		flags_2 &= ~INFORM_ADMINS_ON_RELOCATE_2
 
 	if(state == currently)
 		return
 	else if(!state)
 		STOP_PROCESSING(SSinbounds, src)
-		CLEAR_SECONDARY_FLAG(src, STATIONLOVING)
+		flags_2 &= ~STATIONLOVING_2
 	else
 		START_PROCESSING(SSinbounds, src)
-		SET_SECONDARY_FLAG(src, STATIONLOVING)
+		flags_2 |= STATIONLOVING_2
 
 /atom/movable/proc/relocate()
 	var/targetturf = find_safe_turf(ZLEVEL_STATION)
@@ -593,7 +593,7 @@
 		to_chat(get(src, /mob), "<span class='danger'>You can't help but feel that you just lost something back there...</span>")
 		var/turf/targetturf = relocate()
 		log_game("[src] has been moved out of bounds in [COORD(currentturf)]. Moving it to [COORD(targetturf)].")
-		if(HAS_SECONDARY_FLAG(src, INFORM_ADMINS_ON_RELOCATE))
+		if(flags_2 & INFORM_ADMINS_ON_RELOCATE_2)
 			message_admins("[src] has been moved out of bounds in [ADMIN_COORDJMP(currentturf)]. Moving it to [ADMIN_COORDJMP(targetturf)].")
 
 /atom/movable/proc/in_bounds()

code/game/gamemodes/changeling/powers/mutations.dm

@@ -29,7 +29,7 @@
 
 /obj/effect/proc_holder/changeling/weapon/proc/check_weapon(mob/user, obj/item/hand_item)
 	if(istype(hand_item, weapon_type))
-		user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL will delete the item
+		user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL_1 will delete the item
 		if(!silent)
 			playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
 			user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms their [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
@@ -148,7 +148,7 @@
 	item_state = "arm_blade"
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
-	flags = ABSTRACT | NODROP | DROPDEL
+	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
 	w_class = WEIGHT_CLASS_HUGE
 	force = 25
 	throwforce = 0 //Just to be on the safe side
@@ -227,7 +227,7 @@
 	item_state = "tentacle"
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
-	flags = ABSTRACT | NODROP | DROPDEL | NOBLUDGEON
+	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1 | NOBLUDGEON_1
 	w_class = WEIGHT_CLASS_HUGE
 	ammo_type = /obj/item/ammo_casing/magic/tentacle
 	fire_sound = 'sound/effects/splat.ogg'
@@ -395,7 +395,7 @@
 /obj/item/weapon/shield/changeling
 	name = "shield-like mass"
 	desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield."
-	flags = ABSTRACT | NODROP | DROPDEL
+	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "ling_shield"
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
@@ -443,7 +443,7 @@
 	name = "flesh mass"
 	icon_state = "lingspacesuit"
 	desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
-	flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
+	flags_1 = STOPSPRESSUREDMAGE_1 | NODROP_1 | DROPDEL_1 //Not THICKMATERIAL_1 because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/tank/internals/oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90) //No armor at all.
 
@@ -462,7 +462,7 @@
 	name = "flesh mass"
 	icon_state = "lingspacehelmet"
 	desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front."
-	flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL //Again, no THICKMATERIAL.
+	flags_1 = STOPSPRESSUREDMAGE_1 | NODROP_1 | DROPDEL_1 //Again, no THICKMATERIAL_1.
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90)
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 
@@ -487,7 +487,7 @@
 	name = "chitinous mass"
 	desc = "A tough, hard covering of black chitin."
 	icon_state = "lingarmor"
-	flags = NODROP | DROPDEL
+	flags_1 = NODROP_1 | DROPDEL_1
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0, fire = 90, acid = 90)
 	flags_inv = HIDEJUMPSUIT
@@ -503,6 +503,6 @@
 	name = "chitinous mass"
 	desc = "A tough, hard covering of black chitin with transparent chitin in front."
 	icon_state = "lingarmorhelmet"
-	flags = NODROP | DROPDEL
+	flags_1 = NODROP_1 | DROPDEL_1
 	armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0, fire = 90, acid = 90)
 	flags_inv = HIDEEARS|HIDEHAIR|HIDEEYES|HIDEFACIALHAIR|HIDEFACE

code/game/gamemodes/changeling/powers/mutations.dm.rej

@@ -0,0 +1,19 @@
+diff a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm	(rejected hunks)
+@@ -395,7 +395,7 @@
+ /obj/item/shield/changeling
+ 	name = "shield-like mass"
+ 	desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield."
+-	flags = ABSTRACT | NODROP | DROPDEL
++	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+ 	icon = 'icons/obj/items_and_weapons.dmi'
+ 	icon_state = "ling_shield"
+ 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
+@@ -443,7 +443,7 @@
+ 	name = "flesh mass"
+ 	icon_state = "lingspacesuit"
+ 	desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
+-	flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
++	flags_1 = STOPSPRESSUREDMAGE_1 | NODROP_1 | DROPDEL_1 //Not THICKMATERIAL_1 because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
+ 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen)
+ 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90) //No armor at all.
+ 

code/game/gamemodes/changeling/powers/transform.dm

@@ -8,7 +8,7 @@
 
 /obj/item/clothing/glasses/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 
 /obj/item/clothing/glasses/changeling/attack_hand(mob/user)
 	if(loc == user && user.mind && user.mind.changeling)
@@ -19,7 +19,7 @@
 
 /obj/item/clothing/under/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 
 /obj/item/clothing/under/changeling/attack_hand(mob/user)
 	if(loc == user && user.mind && user.mind.changeling)
@@ -30,7 +30,7 @@
 
 /obj/item/clothing/suit/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 	allowed = list(/obj/item/changeling)
 
 /obj/item/clothing/suit/changeling/attack_hand(mob/user)
@@ -42,7 +42,7 @@
 
 /obj/item/clothing/head/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 
 /obj/item/clothing/head/changeling/attack_hand(mob/user)
 	if(loc == user && user.mind && user.mind.changeling)
@@ -53,7 +53,7 @@
 
 /obj/item/clothing/shoes/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 
 /obj/item/clothing/shoes/changeling/attack_hand(mob/user)
 	if(loc == user && user.mind && user.mind.changeling)
@@ -64,7 +64,7 @@
 
 /obj/item/clothing/gloves/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 
 /obj/item/clothing/gloves/changeling/attack_hand(mob/user)
 	if(loc == user && user.mind && user.mind.changeling)
@@ -75,7 +75,7 @@
 
 /obj/item/clothing/mask/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 
 /obj/item/clothing/mask/changeling/attack_hand(mob/user)
 	if(loc == user && user.mind && user.mind.changeling)
@@ -86,7 +86,7 @@
 
 /obj/item/changeling
 	name = "flesh"
-	flags = NODROP
+	flags_1 = NODROP_1
 	slot_flags = ALL
 	allowed = list(/obj/item/changeling)
 

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -102,7 +102,7 @@
 /obj/effect/clockwork/sigil/submission/sigil_effects(mob/living/L)
 	L.visible_message("<span class='warning'>[src] begins to glow a piercing magenta!</span>", "<span class='sevtug'>You feel something start to invade your mind...</span>")
 	var/oldcolor = color
-	animate(src, color = "#AF0AAF", time = convert_time, flags = ANIMATION_END_NOW)
+	animate(src, color = "#AF0AAF", time = convert_time, flags_1 = ANIMATION_END_NOW)
 	var/obj/effect/temp_visual/ratvar/sigil/glow
 	if(glow_type)
 		glow = new glow_type(get_turf(src))
@@ -114,7 +114,7 @@
 	if(get_turf(L) != get_turf(src))
 		if(glow)
 			qdel(glow)
-		animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW)
+		animate(src, color = oldcolor, time = 20, flags_1 = ANIMATION_END_NOW)
 		addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20)
 		visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
 		return
@@ -136,7 +136,7 @@
 				to_chat(M, "<span class='heavy_brass'>[message] you!</span>")
 			else
 				to_chat(M, "<span class='heavy_brass'>[message] [L.real_name]!</span>")
-	animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW)
+	animate(src, color = oldcolor, time = 20, flags_1 = ANIMATION_END_NOW)
 	addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20)
 	visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
 
@@ -314,7 +314,7 @@
 	if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active)
 		return
 	visible_message("<span class='warning'>[src] begins to glow bright blue!</span>")
-	animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
+	animate(src, alpha = 255, time = 10, flags_1 = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
 	sleep(10)
 //as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality
 	while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src))
@@ -380,4 +380,4 @@
 		animation_number = initial(animation_number)
 		sigil_active = FALSE
 		visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
-	animate(src, alpha = initial(alpha), time = 10, flags = ANIMATION_END_NOW)
+	animate(src, alpha = initial(alpha), time = 10, flags_1 = ANIMATION_END_NOW)

code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm

@@ -98,12 +98,12 @@
 	if(severity == 1 && uses)
 		uses = 0
 		visible_message("<span class='warning'>[src] is disrupted!</span>")
-		animate(src, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW)
+		animate(src, alpha = 0, transform = matrix()*2, time = 10, flags_1 = ANIMATION_END_NOW)
 		deltimer(timerid)
 		timerid = QDEL_IN(src, 10)
 		linked_gateway.uses = 0
 		linked_gateway.visible_message("<span class='warning'>[linked_gateway] is disrupted!</span>")
-		animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW)
+		animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags_1 = ANIMATION_END_NOW)
 		deltimer(linked_gateway.timerid)
 		linked_gateway.timerid = QDEL_IN(linked_gateway, 10)
 		return TRUE
@@ -136,13 +136,13 @@
 		uses = max(0, uses - 1)
 		linked_gateway.uses = max(0, linked_gateway.uses - 1)
 	if(!uses)
-		animate(src, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW)
-		animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW)
+		animate(src, transform = matrix() * 0.1, time = 10, flags_1 = ANIMATION_END_NOW)
+		animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags_1 = ANIMATION_END_NOW)
 		density = FALSE
 		linked_gateway.density = FALSE
 	else
-		animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
-		animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
+		animate(src, transform = matrix() / 1.5, time = 10, flags_1 = ANIMATION_END_NOW)
+		animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags_1 = ANIMATION_END_NOW)
 	addtimer(CALLBACK(src, .proc/check_uses), 10)
 	return TRUE
 

code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm

@@ -328,7 +328,7 @@
 		return
 	if(health == maxHealth)
 		return FALSE
-	else if(!(flags & GODMODE))
+	else if(!(flags_1 & GODMODE))
 		user.visible_message("<span class='notice'>[user]'s [fabricator.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...</span>", \
 		"<span class='alloy'>You start repairin[src == user ? "g yourself" : "g [src]"]...</span>")
 		fabricator.repairing = src

code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm

@@ -365,7 +365,7 @@
 		return
 	if(health == maxHealth)
 		return FALSE
-	else if(!(flags & GODMODE))
+	else if(!(flags_1 & GODMODE))
 		user.visible_message("<span class='notice'>[user]'s [proselytizer.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...</span>", \
 		"<span class='alloy'>You start repairin[src == user ? "g yourself" : "g [src]"]...</span>")
 		proselytizer.repairing = src

code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm

@@ -98,7 +98,7 @@
 				pulled_binding = binding
 				ranged_ability_user.start_pulling(binding)
 				slab.busy = "sustaining Geis"
-				slab.flags |= NODROP
+				slab.flags_1 |= NODROP_1
 				while(!QDELETED(binding) && !QDELETED(ranged_ability_user))
 					if(ranged_ability_user.pulling == binding)
 						pulled_binding = binding
@@ -114,7 +114,7 @@
 							add_mousepointer(ranged_ability_user.client)
 					sleep(1)
 				if(!QDELETED(slab))
-					slab.flags &= ~NODROP
+					slab.flags_1 &= ~NODROP_1
 				in_progress = FALSE
 				successful = TRUE
 

code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm

@@ -20,12 +20,12 @@
 /obj/item/clothing/head/helmet/clockwork/ratvar_act()
 	if(GLOB.ratvar_awakens)
 		armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
-		flags |= STOPSPRESSUREDMAGE
+		flags_1 |= STOPSPRESSUREDMAGE_1
 		max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else
 		armor = list(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
-		flags &= ~STOPSPRESSUREDMAGE
+		flags_1 &= ~STOPSPRESSUREDMAGE_1
 		max_heat_protection_temperature = initial(max_heat_protection_temperature)
 		min_cold_protection_temperature = initial(min_cold_protection_temperature)
 
@@ -76,12 +76,12 @@
 /obj/item/clothing/suit/armor/clockwork/ratvar_act()
 	if(GLOB.ratvar_awakens)
 		armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
-		flags |= STOPSPRESSUREDMAGE
+		flags_1 |= STOPSPRESSUREDMAGE_1
 		max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else
 		armor = list(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
-		flags &= ~STOPSPRESSUREDMAGE
+		flags_1 &= ~STOPSPRESSUREDMAGE_1
 		max_heat_protection_temperature = initial(max_heat_protection_temperature)
 		min_cold_protection_temperature = initial(min_cold_protection_temperature)
 
@@ -137,12 +137,12 @@
 /obj/item/clothing/gloves/clockwork/ratvar_act()
 	if(GLOB.ratvar_awakens)
 		armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
-		flags |= STOPSPRESSUREDMAGE
+		flags_1 |= STOPSPRESSUREDMAGE_1
 		max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else
 		armor = list(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
-		flags &= ~STOPSPRESSUREDMAGE
+		flags_1 &= ~STOPSPRESSUREDMAGE_1
 		max_heat_protection_temperature = initial(max_heat_protection_temperature)
 		min_cold_protection_temperature = initial(min_cold_protection_temperature)
 
@@ -192,9 +192,9 @@
 
 /obj/item/clothing/shoes/clockwork/ratvar_act()
 	if(GLOB.ratvar_awakens)
-		flags |= NOSLIP
+		flags_1 |= NOSLIP_1
 	else
-		flags &= ~NOSLIP
+		flags_1 &= ~NOSLIP_1
 
 /obj/item/clothing/shoes/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
 	if(equipper && !is_servant_of_ratvar(equipper))

code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm

@@ -8,7 +8,7 @@
 	righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
 	w_class = WEIGHT_CLASS_NORMAL
 	force = 5
-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1
 	var/stored_power = 0 //Requires power to function
 	var/max_power = CLOCKCULT_POWER_UNIT * 10
 	var/uses_power = TRUE
@@ -297,7 +297,7 @@
 			if(!silent)
 				to_chat(user, "<span class='warning'>[L] does not serve Ratvar!</span>")
 			return FALSE
-		if(L.health >= L.maxHealth || (L.flags & GODMODE))
+		if(L.health >= L.maxHealth || (L.flags_1 & GODMODE))
 			if(!silent)
 				to_chat(user, "<span class='warning'>[L == user ? "You are" : "[L] is"] at maximum health!</span>")
 			return FALSE

code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -82,7 +82,7 @@
 	. = ..()
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!disassembled)
 			resistance_flags |= INDESTRUCTIBLE
 			countdown.stop()

code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm

@@ -126,7 +126,7 @@
 	desc = "A flickering ring preventing you from holding items."
 	icon = 'icons/effects/clockwork_effects.dmi'
 	icon_state = "geisbinding_full"
-	flags = NODROP|ABSTRACT|DROPDEL
+	flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1
 
 /obj/item/geis_binding/pre_attackby(atom/target, mob/living/user, params)
 	return FALSE

code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm

@@ -70,6 +70,6 @@
 	return ..()
 
 /obj/structure/destructible/clockwork/wall_gear/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT) && disassembled)
+	if(!(flags_1 & NODECONSTRUCT_1) && disassembled)
 		new /obj/item/stack/tile/brass(loc, 3)
 	return ..()

code/game/gamemodes/cult/cult_items.dm

@@ -5,7 +5,7 @@
 	item_state = "cultblade"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	sharpness = IS_SHARP
 	w_class = WEIGHT_CLASS_BULKY
 	force = 30
@@ -31,7 +31,7 @@
 /obj/item/weapon/melee/cultblade/ghost
 	name = "eldritch sword"
 	force = 19 //can't break normal airlocks
-	flags = NODROP|DROPDEL
+	flags_1 = NODROP_1|DROPDEL_1
 
 /obj/item/weapon/melee/cultblade/pickup(mob/living/user)
 	..()
@@ -108,7 +108,7 @@
 	item_state = "cult_hoodalt"
 
 /obj/item/clothing/head/culthood/alt/ghost
-	flags = NODROP|DROPDEL
+	flags_1 = NODROP_1|DROPDEL_1
 
 /obj/item/clothing/suit/cultrobes/alt
 	name = "cultist robes"
@@ -117,7 +117,7 @@
 	item_state = "cultrobesalt"
 
 /obj/item/clothing/suit/cultrobes/alt/ghost
-	flags = NODROP|DROPDEL
+	flags_1 = NODROP_1|DROPDEL_1
 
 
 /obj/item/clothing/head/magus

code/game/gamemodes/cult/cult_items.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm	(rejected hunks)
+@@ -31,7 +31,7 @@
+ /obj/item/melee/cultblade/ghost
+ 	name = "eldritch sword"
+ 	force = 19 //can't break normal airlocks
+-	flags = NODROP|DROPDEL
++	flags_1 = NODROP_1|DROPDEL_1
+ 
+ /obj/item/melee/cultblade/pickup(mob/living/user)
+ 	..()

code/game/gamemodes/cult/talisman.dm

@@ -343,7 +343,7 @@
 	desc = "Shackles that bind the wrists with sinister magic."
 	trashtype = /obj/item/weapon/restraints/handcuffs/energy/used
 	origin_tech = "materials=2;magnets=5"
-	flags = DROPDEL
+	flags_1 = DROPDEL_1
 
 /obj/item/weapon/restraints/handcuffs/energy/cult/used/dropped(mob/user)
 	user.visible_message("<span class='danger'>[user]'s shackles shatter in a discharge of dark magic!</span>", \

code/game/gamemodes/cult/talisman.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm	(rejected hunks)
+@@ -343,7 +343,7 @@
+ 	desc = "Shackles that bind the wrists with sinister magic."
+ 	trashtype = /obj/item/restraints/handcuffs/energy/used
+ 	origin_tech = "materials=2;magnets=5"
+-	flags = DROPDEL
++	flags_1 = DROPDEL_1
+ 
+ /obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user)
+ 	user.visible_message("<span class='danger'>[user]'s shackles shatter in a discharge of dark magic!</span>", \

code/game/gamemodes/devil/true_devil/_true_devil.dm

@@ -65,7 +65,7 @@
 
 	//Left hand items
 	for(var/obj/item/I in held_items)
-		if(!(I.flags & ABSTRACT))
+		if(!(I.flags_1 & ABSTRACT_1))
 			if(I.blood_DNA)
 				msg += "<span class='warning'>It is holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
 			else

code/game/gamemodes/game_mode.dm

@@ -19,7 +19,7 @@
 	var/probability = 0
 	var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm
 	var/explosion_in_progress = 0 //sit back and relax
-	var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such
+	var/round_ends_with_antag_death = 0 //flags_1 the "one verse the station" antags as such
 	var/list/datum/mind/modePlayer = new
 	var/list/datum/mind/antag_candidates = list()	// List of possible starting antags goes here
 	var/list/restricted_jobs = list()	// Jobs it doesn't make sense to be.  I.E chaplain or AI cultist
@@ -83,7 +83,7 @@
 
 	if(SSdbcore.Connect())
 		var/sql
-		if(SSticker.mode)
+		if(SSticker.mode)
 			sql += "game_mode = '[SSticker.mode]'"
 		if(GLOB.revdata.originmastercommit)
 			if(sql)
@@ -111,7 +111,7 @@
 	var/list/living_crew = list()
 
 	for(var/mob/Player in GLOB.mob_list)
-		if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client)
+		if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client)
 			living_crew += Player
 	if(living_crew.len / GLOB.joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh
 		message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew")
@@ -120,7 +120,7 @@
 	var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len)
 	var/list/datum/game_mode/usable_modes = list()
 	for(var/datum/game_mode/G in runnable_modes)
-		if(G.reroll_friendly && living_crew >= G.required_players)
+		if(G.reroll_friendly && living_crew >= G.required_players)
 			usable_modes += G
 		else
 			qdel(G)
@@ -208,7 +208,7 @@
 			return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
 
 		for(var/mob/Player in GLOB.living_mob_list)
-			if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client)
+			if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client)
 				if(Player.mind.special_role) //Someone's still antaging!
 					living_antag_player = Player
 					return 0
@@ -369,7 +369,7 @@
 	if(candidates.len < recommended_enemies)
 		for(var/mob/dead/new_player/player in players)
 			if(player.client && player.ready == PLAYER_READY_TO_PLAY)
-				if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one
+				if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one
 					if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans
 						drafted += player.mind
 

code/game/gamemodes/gang/dominator.dm

@@ -126,11 +126,11 @@
 		icon_state = "dominator-broken"
 
 /obj/machinery/dominator/obj_break(damage_flag)
-	if(!(stat & BROKEN) && !(flags & NODECONSTRUCT))
+	if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
 		set_broken()
 
 /obj/machinery/dominator/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!(stat & BROKEN))
 			set_broken()
 		new /obj/item/stack/sheet/plasteel(src.loc)

code/game/gamemodes/gang/gang_items.dm

@@ -355,7 +355,7 @@
 	name = "Wetwork boots"
 	desc = "A gang's best hitmen are prepared for anything."
 	permeability_coefficient = 0.01
-	flags = NOSLIP
+	flags_1 = NOSLIP_1
 
 /datum/gang_item/equipment/pen
 	name = "Recruitment Pen"