Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
@@ -410,7 +410,7 @@
 						H.equip_to_slot_or_del(I, slot_w_uniform)
 						qdel(olduniform)
 						if(droptype == "Yes")
-							I.flags |= NODROP
+							I.flags_1 |= NODROP_1
 				else
 					to_chat(H, "You're not kawaii enough for this.")

@@ -59,7 +59,7 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 	W.access += get_all_centcom_access()
 	W.assignment = "Highlander"
 	W.registered_name = real_name
-	W.flags |= NODROP
+	W.flags_1 |= NODROP_1
 	W.update_label(real_name)
 	equip_to_slot_or_del(W, slot_wear_id)

@@ -3,7 +3,7 @@
 	desc = "A small electronic device that should never exist."
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = ""
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_SMALL
 	materials = list(MAT_METAL=100)
 	throwforce = 2
@@ -0,0 +1,10 @@
+diff a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm	(rejected hunks)
+@@ -8,7 +8,7 @@
+ 	w_class = WEIGHT_CLASS_NORMAL
+ 	throw_speed = 2
+ 	throw_range = 4
+-	flags = CONDUCT
+	flags_1 = CONDUCT_1
+ 	var/status = FALSE   //0 - not readied //1 - bomb finished with welder
+ 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
+ 	var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
@@ -5,7 +5,7 @@
 	item_state = "assembly"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	throwforce = 5
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 2
@@ -6,7 +6,7 @@
 	var/obj/item/clothing/head/helmet/part1 = null
 	var/obj/item/device/electropack/part2 = null
 	w_class = WEIGHT_CLASS_HUGE
-	flags = CONDUCT
+	flags_1 = CONDUCT_1

 /obj/item/assembly/shock_kit/Destroy()
 	qdel(part1)
@@ -4,7 +4,7 @@
 	icon_state = "voice"
 	materials = list(MAT_METAL=500, MAT_GLASS=50)
 	origin_tech = "magnets=1;engineering=1"
-	flags = HEAR
+	flags_1 = HEAR_1
 	attachable = 1
 	verb_say = "beeps"
 	verb_ask = "beeps"
@@ -0,0 +1,10 @@
+diff a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm	(rejected hunks)
+@@ -734,7 +734,7 @@
+ 	update_icon()
+ 
+ /obj/machinery/airalarm/deconstruct(disassembled = TRUE)
+-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
+ 		new /obj/item/stack/sheet/metal(loc, 2)
+ 		var/obj/item/I = new /obj/item/electronics/airalarm(loc)
+ 		if(!disassembled)
@@ -186,7 +186,7 @@ Pipelines + Other Objects -> Pipe network
 	user.throw_at(target, range, speed)

 /obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(can_unwrench)
 			var/obj/item/pipe/stored = new(loc, make_from=src)
 			if(!disassembled)
@@ -247,7 +247,7 @@


 /obj/machinery/portable_atmospherics/canister/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!(stat & BROKEN))
 			canister_break()
 		if(disassembled)
@@ -273,7 +273,7 @@
 		return ..()

 /obj/machinery/portable_atmospherics/canister/obj_break(damage_flag)
-	if((stat & BROKEN) || (flags & NODECONSTRUCT))
+	if((flags_1 & BROKEN) || (flags_1 & NODECONSTRUCT_1))
 		return
 	canister_break()

@@ -23,6 +23,7 @@
 	armour_penetration = 1000
 	resistance_flags = INDESTRUCTIBLE
 	anchored = TRUE
+	flags_2 = SLOWS_WHILE_IN_HAND_2
 	var/team = WHITE_TEAM
 	var/reset_cooldown = 0
 	var/obj/effect/ctf/flag_reset/reset
@@ -0,0 +1,18 @@
+diff a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm	(rejected hunks)
+@@ -473,14 +473,14 @@
+ 	W.registered_name = H.real_name
+ 	W.update_label(W.registered_name, W.assignment)
+ 
+-	// The shielded hardsuit is already NODROP
+	// The shielded hardsuit is already NODROP_1
+ 	no_drops += H.get_item_by_slot(slot_gloves)
+ 	no_drops += H.get_item_by_slot(slot_shoes)
+ 	no_drops += H.get_item_by_slot(slot_w_uniform)
+ 	no_drops += H.get_item_by_slot(slot_ears)
+ 	for(var/i in no_drops)
+ 		var/obj/item/I = i
+-		I.flags |= NODROP
+		I.flags_1 |= NODROP_1
+ 
+ /datum/outfit/ctf/instagib
+ 	r_hand = /obj/item/gun/energy/laser/instakill
@@ -5,7 +5,7 @@
 	item_state = "radio"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1
 	w_class = WEIGHT_CLASS_SMALL
 	siemens_coefficient = 1
 	var/obj/machinery/computer/cargo/cargo_console = null
@@ -115,7 +115,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
 		return FALSE
 	if(!get_cost(O, contr, emag))
 		return FALSE
-	if(HAS_SECONDARY_FLAG(O, HOLOGRAM))
+	if(O.flags_2 & HOLOGRAM_2)
 		return FALSE
 	return TRUE

@@ -60,7 +60,7 @@
 		to_chat(owner, "<span class='warning'>You shouldn't be able to toggle a camogear helmetmask if you're not wearing it</span>")
 	if(new_headgear)
 		// Force drop the item in the headslot, even though
-		// it's NODROP
+		// it's NODROP_1
 		D.dropItemToGround(target, TRUE)
 		qdel(old_headgear)
 		// where is `slot_head` defined? WHO KNOWS
@@ -85,7 +85,7 @@
 	for(var/V in typesof(chameleon_type))
 		if(ispath(V) && ispath(V, /obj/item))
 			var/obj/item/I = V
-			if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT))
+			if(chameleon_blacklist[V] || (initial(I.flags_1) & ABSTRACT_1))
 				continue
 			if(!initial(I.icon_state) || !initial(I.item_state))
 				continue
@@ -314,7 +314,7 @@
 /obj/item/clothing/head/chameleon/drone
 	// The camohat, I mean, holographic hat projection, is part of the
 	// drone itself.
-	flags = NODROP
+	flags_1 = NODROP_1
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	// which means it offers no protection, it's just air and light

@@ -334,7 +334,7 @@
 	resistance_flags = 0
 	armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)

-	flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -362,7 +362,7 @@

 /obj/item/clothing/mask/chameleon/drone
 	//Same as the drone chameleon hat, undroppable and no protection
-	flags = NODROP
+	flags_1 = NODROP_1
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	// Can drones use the voice changer part? Let's not find out.
 	vchange = 0
@@ -0,0 +1,10 @@
+diff a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm	(rejected hunks)
+@@ -384,7 +384,7 @@
+ 	item_color = "black"
+ 	desc = "A pair of black shoes."
+ 	permeability_coefficient = 0.05
+-	flags = NOSLIP
+	flags_1 = NOSLIP_1
+ 	origin_tech = "syndicate=2"
+ 	resistance_flags = 0
+ 	pockets = /obj/item/storage/internal/pocket/shoes
@@ -341,7 +341,7 @@ BLIND     // can't see anything
 		src.icon_state = initial(icon_state)
 		gas_transfer_coefficient = initial(gas_transfer_coefficient)
 		permeability_coefficient = initial(permeability_coefficient)
-		flags |= visor_flags
+		flags_1 |= visor_flags
 		flags_inv |= visor_flags_inv
 		flags_cover |= visor_flags_cover
 		to_chat(user, "<span class='notice'>You push \the [src] back into place.</span>")
@@ -351,7 +351,7 @@ BLIND     // can't see anything
 		to_chat(user, "<span class='notice'>You push \the [src] out of the way.</span>")
 		gas_transfer_coefficient = null
 		permeability_coefficient = null
-		flags &= ~visor_flags
+		flags_1 &= ~visor_flags
 		flags_inv &= ~visor_flags_inv
 		flags_cover &= ~visor_flags_cover
 		if(adjusted_flags)
@@ -470,7 +470,7 @@ BLIND     // can't see anything
 	name = "space helmet"
 	icon_state = "spaceold"
 	desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
 	item_state = "spaceold"
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
@@ -785,7 +785,7 @@ BLIND     // can't see anything

 /obj/item/clothing/proc/visor_toggling() //handles all the actual toggling of flags
 	up = !up
-	flags ^= visor_flags
+	flags_1 ^= visor_flags
 	flags_inv ^= visor_flags_inv
 	flags_cover ^= initial(flags_cover)
 	icon_state = "[initial(icon_state)][up ? "up" : ""]"
@@ -0,0 +1,10 @@
+diff a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm	(rejected hunks)
+@@ -494,7 +494,7 @@ BLIND     // can't see anything
+ 	w_class = WEIGHT_CLASS_BULKY
+ 	gas_transfer_coefficient = 0.01
+ 	permeability_coefficient = 0.02
+-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
+ 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
+ 	slowdown = 1
@@ -15,11 +15,7 @@
 	strip_delay = 15
 	equip_delay_other = 25
 	resistance_flags = FLAMMABLE
-
-/obj/item/clothing/ears/earmuffs/Initialize(mapload)
-	. = ..()
-	SET_SECONDARY_FLAG(src, BANG_PROTECT)
-	SET_SECONDARY_FLAG(src, HEALS_EARS)
+	flags_2 = BANG_PROTECT_2|HEALS_EARS_2

 /obj/item/clothing/ears/headphones
 	name = "headphones"
@@ -280,7 +280,7 @@
 	name = "thermoncle"
 	desc = "Never before has seeing through walls felt so gentlepersonly."
 	icon_state = "thermoncle"
-	flags = null //doesn't protect eyes because it's a monocle, duh
+	flags_1 = null //doesn't protect eyes because it's a monocle, duh

 /obj/item/clothing/glasses/thermal/monocle/examine(mob/user) //Different examiners see a different description!
 	var/desk = desc
@@ -0,0 +1,10 @@
+diff a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm	(rejected hunks)
+@@ -331,7 +331,7 @@
+ 	vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
+ 	darkness_view = 8
+ 	scan_reagents = 1
+-	flags = NODROP
+	flags_1 = NODROP_1
+ 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+ 
+ /obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -1,7 +1,7 @@
 /obj/item/clothing/glasses/hud
 	name = "HUD"
 	desc = "A heads-up display that provides important info in (almost) real time."
-	flags = null //doesn't protect eyes because it's a monocle, duh
+	flags_1 = null //doesn't protect eyes because it's a monocle, duh
 	origin_tech = "magnets=3;biotech=2"
 	var/hud_type = null

@@ -46,7 +46,7 @@
 	item_color = "red"
 	dog_fashion = null
 	name = "firefighter helmet"
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
 	cold_protection = HEAD
@@ -56,7 +56,7 @@
 	icon_state = "hardhat0_white"
 	item_state = "hardhat0_white"
 	item_color = "white"
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
 	cold_protection = HEAD
@@ -76,7 +76,7 @@
 	dog_fashion = null
 	name = "atmospheric technician's firefighting helmet"
 	desc = "A firefighter's helmet, able to keep the user cool in any situation."
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
@@ -13,13 +13,13 @@
 	resistance_flags = 0
 	flags_cover = HEADCOVERSEYES
 	flags_inv = HIDEHAIR
+	flags_2 = BANG_PROTECT_2

 	dog_fashion = /datum/dog_fashion/head/helmet


 /obj/item/clothing/head/helmet/Initialize()
 	..()
-	SET_SECONDARY_FLAG(src, BANG_PROTECT)

 /obj/item/clothing/head/helmet/sec
 	can_flashlight = 1
@@ -65,7 +65,7 @@
 		if(world.time > cooldown + toggle_cooldown)
 			cooldown = world.time
 			up = !up
-			flags ^= visor_flags
+			flags_1 ^= visor_flags
 			flags_inv ^= visor_flags_inv
 			flags_cover ^= visor_flags_cover
 			icon_state = "[initial(icon_state)][up ? "up" : ""]"
@@ -110,7 +110,7 @@
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	strip_delay = 80
 	dog_fashion = null

@@ -191,11 +191,11 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	strip_delay = 80
 	dog_fashion = null
+	// old knight helmets do not offer protection against loud noises
+	flags_2 = NONE

 /obj/item/clothing/head/helmet/knight/Initialize(mapload)
 	..()
-	// old knight helmets do not offer protection against loud noises
-	CLEAR_SECONDARY_FLAG(src, BANG_PROTECT)

 /obj/item/clothing/head/helmet/knight/blue
 	icon_state = "knight_blue"
@@ -110,7 +110,7 @@

 /obj/item/clothing/head/beret/highlander
 	desc = "That was white fabric. <i>Was.</i>"
-	flags = NODROP
+	flags_1 = NODROP_1
 	dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES

 //Security
@@ -219,7 +219,7 @@
 	icon_state = "shamebrero"
 	item_state = "shamebrero"
 	desc = "Once it's on, it never comes off."
-	flags = NODROP
+	flags_1 = NODROP_1
 	dog_fashion = null

 /obj/item/clothing/head/cone
@@ -4,8 +4,8 @@
 	icon_state = "breath"
 	item_state = "m_mask"
 	body_parts_covered = 0
-	flags = MASKINTERNALS
-	visor_flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
+	visor_flags = MASKINTERNALS_1
 	w_class = WEIGHT_CLASS_SMALL
 	gas_transfer_coefficient = 0.10
 	permeability_coefficient = 0.50
@@ -2,7 +2,7 @@
 	name = "gas mask"
 	desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate
 	icon_state = "gas_alt"
-	flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_NORMAL
 	item_state = "gas_alt"
@@ -52,7 +52,7 @@
 /obj/item/clothing/mask/gas/clown_hat
 	name = "clown wig and mask"
 	desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "clown"
 	item_state = "clown_hat"
 	flags_cover = MASKCOVERSEYES
@@ -84,7 +84,7 @@
 /obj/item/clothing/mask/gas/sexyclown
 	name = "sexy-clown wig and mask"
 	desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "sexyclown"
 	item_state = "sexyclown"
 	flags_cover = MASKCOVERSEYES
@@ -93,7 +93,7 @@
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
 	desc = "The traditional mime's mask. It has an eerie facial posture."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "mime"
 	item_state = "mime"
 	flags_cover = MASKCOVERSEYES
@@ -125,7 +125,7 @@
 /obj/item/clothing/mask/gas/monkeymask
 	name = "monkey mask"
 	desc = "A mask used when acting as a monkey."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "monkeymask"
 	item_state = "monkeymask"
 	flags_cover = MASKCOVERSEYES
@@ -134,7 +134,7 @@
 /obj/item/clothing/mask/gas/sexymime
 	name = "sexy mime mask"
 	desc = "A traditional female mime's mask."
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	icon_state = "sexymime"
 	item_state = "sexymime"
 	flags_cover = MASKCOVERSEYES
@@ -155,7 +155,7 @@
 	name = "owl mask"
 	desc = "Twoooo!"
 	icon_state = "owl"
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	flags_cover = MASKCOVERSEYES
 	resistance_flags = FLAMMABLE

@@ -7,10 +7,10 @@
 	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/adjust)
 	icon_state = "sechailer"
 	item_state = "sechailer"
-	flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
 	flags_inv = HIDEFACIALHAIR|HIDEFACE
 	w_class = WEIGHT_CLASS_SMALL
-	visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	visor_flags = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
 	visor_flags_inv = HIDEFACE
 	flags_cover = MASKCOVERSMOUTH
 	visor_flags_cover = MASKCOVERSMOUTH
@@ -24,7 +24,7 @@
 		bananium.use_amount_type(100, MAT_BANANIUM)
 		if(bananium.amount(MAT_BANANIUM) < 100)
 			on = !on
-			flags &= ~NOSLIP
+			flags_1 &= ~NOSLIP_1
 			update_icon()
 			to_chat(loc, "<span class='warning'>You ran out of bananium!</span>")
 	else
@@ -63,9 +63,9 @@
 		update_icon()
 		to_chat(user, "<span class='notice'>You [on ? "activate" : "deactivate"] the prototype shoes.</span>")
 		if(on)
-			flags |= NOSLIP
+			flags_1 |= NOSLIP_1
 		else
-			flags &= ~NOSLIP
+			flags_1 &= ~NOSLIP_1
 	else
 		to_chat(user, "<span class='warning'>You need bananium to turn the prototype shoes on!</span>")

@@ -22,10 +22,10 @@

 /obj/item/clothing/shoes/magboots/attack_self(mob/user)
 	if(src.magpulse)
-		src.flags &= ~NOSLIP
+		src.flags_1 &= ~NOSLIP_1
 		src.slowdown = SHOES_SLOWDOWN
 	else
-		src.flags |= NOSLIP
+		src.flags_1 |= NOSLIP_1
 		src.slowdown = slowdown_active
 	magpulse = !magpulse
 	icon_state = "[magboot_state][magpulse]"
@@ -37,7 +37,7 @@
 		A.UpdateButtonIcon()

 /obj/item/clothing/shoes/magboots/negates_gravity()
-	return flags & NOSLIP
+	return flags_1 & NOSLIP_1

 /obj/item/clothing/shoes/magboots/examine(mob/user)
 	..()
@@ -28,7 +28,7 @@
 	name = "\improper SWAT boots"
 	desc = "High speed, no drag combat boots."
 	permeability_coefficient = 0.01
-	flags = NOSLIP
+	flags_1 = NOSLIP_1
 	armor = list(melee = 40, bullet = 30, laser = 25, energy = 25, bomb = 50, bio = 30, rad = 30, fire = 90, acid = 50)

 /obj/item/clothing/shoes/sandal
@@ -54,7 +54,7 @@
 	name = "galoshes"
 	icon_state = "galoshes"
 	permeability_coefficient = 0.05
-	flags = NOSLIP
+	flags_1 = NOSLIP_1
 	slowdown = SHOES_SLOWDOWN+1
 	strip_delay = 50
 	equip_delay_other = 50
@@ -154,7 +154,7 @@
 	icon_state = "cultalt"

 /obj/item/clothing/shoes/cult/alt/ghost
-	flags = NODROP|DROPDEL
+	flags_1 = NODROP_1|DROPDEL_1

 /obj/item/clothing/shoes/cyborg
 	name = "cyborg boots"
@@ -95,7 +95,7 @@
 		teleporting = 0
 		for(var/obj/item/I in user.held_items)
 			if(I in hands_nodrop)
-				I.flags &= ~NODROP
+				I.flags_1 &= ~NODROP_1
 		if(camera)
 			camera.remove_target_ui()
 			camera.loc = user
@@ -130,9 +130,9 @@

 		hands_nodrop = list()
 		for(var/obj/item/I in user.held_items)
-			if(!(I.flags & NODROP))
+			if(!(I.flags_1 & NODROP_1))
 				hands_nodrop += I
-				I.flags |= NODROP
+				I.flags_1 |= NODROP_1
 		user.animate_movement = NO_STEPS
 		user.changeNext_move(8 + phase_in_ds)
 		user.notransform = 1
@@ -191,9 +191,9 @@
 			if(user.head && istype(user.head, /obj/item/clothing/head/helmet/space/chronos))
 				to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Mounting /dev/helm")
 				helmet = user.head
-				helmet.flags |= NODROP
+				helmet.flags_1 |= NODROP_1
 				helmet.suit = src
-				src.flags |= NODROP
+				src.flags_1 |= NODROP_1
 				to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Starting brainwave scanner")
 				to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Starting ui display driver")
 				to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Initializing chronowalk4-view")
@@ -212,7 +212,7 @@
 		activating = 1
 		var/mob/living/carbon/human/user = src.loc
 		var/hard_landing = teleporting && force
-		src.flags &= ~NODROP
+		src.flags_1 &= ~NODROP_1
 		cooldown = world.time + cooldowntime * 1.5
 		activated = 0
 		activating = 0
@@ -233,7 +233,7 @@
 						to_chat(user, "\[ <span style='color: #ff5500;'>ok</span> \] Unmounting /dev/helmet")
 					to_chat(user, "logout")
 		if(helmet)
-			helmet.flags &= ~NODROP
+			helmet.flags_1 &= ~NODROP_1
 			helmet.suit = null
 			helmet = null
 		if(camera)
@@ -5,7 +5,7 @@
 //There is toggleable "stabilizers" that will make momentum go down FAST instead of its normal slow rate
 //The suit is heavy and will slow you down on the ground but is a bit faster then usual in air
 //The speed at which you drift is determined by your current momentum
-//Also, I should probably add in some kind of limiting mechanic but I really don't like having to refill this all the time, expecially as it will be NODROP.
+//Also, I should probably add in some kind of limiting mechanic but I really don't like having to refill this all the time, expecially as it will be NODROP_1.
 //Apparently due to code limitations you have to detect mob movement with.. shoes.
 //The object that handles the flying itself - FLIGHT PACK --------------------------------------------------------------------------------------
 /obj/item/device/flightpack
@@ -859,9 +859,9 @@
 	if(suit)
 		active = toggle
 		if(active)
-			src.flags |= NOSLIP
+			src.flags_1 |= NOSLIP_1
 		if(!active)
-			src.flags &= ~NOSLIP
+			src.flags_1 &= ~NOSLIP_1

 /obj/item/clothing/shoes/flightshoes/item_action_slot_check(slot)
 	if(slot == slot_shoes)
@@ -1043,7 +1043,7 @@
 			usermessage("You're already wearing something on your back!", "boldwarning")
 			return FALSE
 		user.equip_to_slot_if_possible(pack,slot_back,0,0,1)
-		pack.flags |= NODROP
+		pack.flags_1 |= NODROP_1
 		resync()
 		user.visible_message("<span class='notice'>A [pack.name] extends from [user]'s [name] and clamps to their back!</span>")
 		user.update_inv_wear_suit()
@@ -1057,7 +1057,7 @@
 			return FALSE
 		if(pack.flight && forced)
 			pack.disable_flight(1)
-		pack.flags &= ~NODROP
+		pack.flags_1 &= ~NODROP_1
 		resync()
 		if(user)
 			user.transferItemToLoc(pack, src, TRUE)
@@ -1081,14 +1081,14 @@
 			usermessage("You're already wearing something on your feet!", "boldwarning")
 			return FALSE
 		user.equip_to_slot_if_possible(shoes,slot_shoes,0,0,1)
-		shoes.flags |= NODROP
+		shoes.flags_1 |= NODROP_1
 		user.visible_message("<span class='notice'>[user]'s [name] extends a pair of [shoes.name] over their feet!</span>")
 		user.update_inv_wear_suit()
 	playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
 	deployedshoes = TRUE

 /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/retract_flightshoes(forced = FALSE)
-	shoes.flags &= ~NODROP
+	shoes.flags_1 &= ~NODROP_1
 	playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
 	if(user)
 		user.transferItemToLoc(shoes, src, TRUE)
@@ -231,7 +231,7 @@
 	var/obj/item/clothing/suit/space/hardsuit/syndi/linkedsuit = null
 	actions_types = list(/datum/action/item_action/toggle_helmet_mode)
 	visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
-	visor_flags = STOPSPRESSUREDMAGE
+	visor_flags = STOPSPRESSUREDMAGE_1

 /obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon()
 	icon_state = "hardsuit[on]-[item_color]"
@@ -251,7 +251,7 @@
 		name = initial(name)
 		desc = initial(desc)
 		set_light(brightness_on)
-		flags |= visor_flags
+		flags_1 |= visor_flags
 		flags_cover |= HEADCOVERSEYES | HEADCOVERSMOUTH
 		flags_inv |= visor_flags_inv
 		cold_protection |= HEAD
@@ -260,7 +260,7 @@
 		name += " (combat)"
 		desc = alt_desc
 		set_light(0)
-		flags &= ~visor_flags
+		flags_1 &= ~visor_flags
 		flags_cover &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH)
 		flags_inv &= ~visor_flags_inv
 		cold_protection &= ~HEAD
@@ -281,13 +281,13 @@
 			linkedsuit.name = initial(linkedsuit.name)
 			linkedsuit.desc = initial(linkedsuit.desc)
 			linkedsuit.slowdown = 1
-			linkedsuit.flags |= STOPSPRESSUREDMAGE
+			linkedsuit.flags_1 |= STOPSPRESSUREDMAGE_1
 			linkedsuit.cold_protection |= CHEST | GROIN | LEGS | FEET | ARMS | HANDS
 		else
 			linkedsuit.name += " (combat)"
 			linkedsuit.desc = linkedsuit.alt_desc
 			linkedsuit.slowdown = 0
-			linkedsuit.flags &= ~(STOPSPRESSUREDMAGE)
+			linkedsuit.flags_1 &= ~(STOPSPRESSUREDMAGE_1)
 			linkedsuit.cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS)

 		linkedsuit.icon_state = "hardsuit[on]-[item_color]"
@@ -641,7 +641,7 @@
 	icon_state = "ert_medical"
 	item_state = "ert_medical"
 	item_color = "ert_medical"
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP //Dont want people changing into the other teams gear
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 | NODROP_1 //Dont want people changing into the other teams gear
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/ctf
 	armor = list(melee = 0, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 100, rad = 100, fire = 95, acid = 95)
 	slowdown = 0
@@ -57,7 +57,7 @@ Contains:
 	name = "officer's beret"
 	desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."
 	icon_state = "beret_badge"
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	flags_inv = 0
 	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
 	strip_delay = 130
@@ -112,7 +112,7 @@ Contains:
 	name = "Santa's hat"
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	flags_cover = HEADCOVERSEYES

 	dog_fashion = /datum/dog_fashion/head/santa
@@ -123,7 +123,7 @@ Contains:
 	icon_state = "santa"
 	item_state = "santa"
 	slowdown = 0
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	allowed = list(/obj/item) //for stuffing exta special presents


@@ -134,7 +134,7 @@ Contains:
 	icon_state = "pirate"
 	item_state = "pirate"
 	armor = list(melee = 30, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 60, acid = 75)
-	flags = STOPSPRESSUREDMAGE
+	flags_1 = STOPSPRESSUREDMAGE_1
 	strip_delay = 40
 	equip_delay_other = 20
 	flags_cover = HEADCOVERSEYES
@@ -161,7 +161,7 @@ Contains:
 	item_color = "ert_commander"
 	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80)
 	strip_delay = 130
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 | NODROP_1
 	brightness_on = 7

 /obj/item/clothing/suit/space/hardsuit/ert
@@ -261,7 +261,7 @@ Contains:
 	armor = list(melee = -20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 75, fire = 60, acid = 75)	//As whimpy as a space carp
 	brightness_on = 0 //luminosity when on
 	actions_types = list()
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 | NODROP_1


 /obj/item/clothing/suit/space/hardsuit/carp
@@ -343,7 +343,7 @@ Contains:
 /obj/item/clothing/suit/space/fragile/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(!torn && prob(50))
 		to_chat(owner, "<span class='warning'>[src] tears from the damage, breaking the air-tight seal!</span>")
-		src.flags -= STOPSPRESSUREDMAGE
+		src.flags_1 &= ~STOPSPRESSUREDMAGE_1
 		src.name = "torn [src]."
 		src.desc = "A bulky suit meant to protect the user during emergency situations, at least until someone tore a hole in the suit."
 		src.torn = TRUE
@@ -363,7 +363,7 @@
 	item_state = "swat_suit"
 	w_class = WEIGHT_CLASS_BULKY
 	gas_transfer_coefficient = 0.90
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	slowdown = 3
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -372,7 +372,7 @@
 /obj/item/clothing/suit/armor/tdome
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 90, acid = 90)
@@ -0,0 +1,10 @@
+diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm	(rejected hunks)
+@@ -348,7 +348,7 @@
+ 	w_class = WEIGHT_CLASS_BULKY
+ 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ 	allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals/emergency_oxygen)
+-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
+ 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ 	cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+ 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
@@ -4,7 +4,7 @@
 	icon_state = "bio"
 	desc = "A hood that protects the head and face from biological comtaminants."
 	permeability_coefficient = 0.01
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20, fire = 30, acid = 100)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
 	resistance_flags = ACID_PROOF
@@ -0,0 +1,10 @@
+diff a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm	(rejected hunks)
+@@ -18,7 +18,7 @@
+ 	w_class = WEIGHT_CLASS_BULKY
+ 	gas_transfer_coefficient = 0.01
+ 	permeability_coefficient = 0.01
+-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
+ 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ 	slowdown = 1
+ 	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/pen, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
@@ -15,7 +15,7 @@
 	icon_state = "golhood"
 	desc = "A hood for a cloak"
 	body_parts_covered = HEAD
-	flags = NODROP
+	flags_1 = NODROP_1
 	flags_inv = HIDEHAIR|HIDEEARS

 /obj/item/clothing/neck/cloak/suicide_act(mob/user)
@@ -50,7 +50,7 @@
 	desc = "Suit for a cyborg costume."
 	icon_state = "death"
 	item_state = "death"
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	fire_resist = T0C+5200
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

@@ -213,7 +213,7 @@
 	desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally."
 	icon_state = "ponchoshame"
 	item_state = "ponchoshame"
-	flags = NODROP
+	flags_1 = NODROP_1

 /obj/item/clothing/suit/whitedress
 	name = "white dress"
@@ -270,7 +270,7 @@
 	icon_state = "bee"
 	item_state = "labcoat"
 	body_parts_covered = CHEST|GROIN|ARMS
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	hoodtype = /obj/item/clothing/head/hooded/bee_hood

 /obj/item/clothing/head/hooded/bee_hood
@@ -278,7 +278,7 @@
 	desc = "A hood attached to a bee costume."
 	icon_state = "bee"
 	body_parts_covered = HEAD
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	flags_inv = HIDEHAIR|HIDEEARS

 /obj/item/clothing/suit/hooded/bloated_human	//OH MY GOD WHAT HAVE YOU DONE!?!?!?
@@ -56,7 +56,7 @@
 	name = "bomb hood"
 	desc = "Use in case of bomb."
 	icon_state = "bombsuit"
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	armor = list(melee = 20, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0, fire = 80, acid = 50)
 	flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
 	cold_protection = HEAD
@@ -77,7 +77,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	slowdown = 2
 	armor = list(melee = 20, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0, fire = 80, acid = 50)
@@ -108,7 +108,7 @@
 	name = "radiation hood"
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'"
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
 	flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100, fire = 30, acid = 30)
 	strip_delay = 60
@@ -0,0 +1,19 @@
+diff a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm	(rejected hunks)
+@@ -21,7 +21,7 @@
+ 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/extinguisher, /obj/item/crowbar)
+ 	slowdown = 1
+ 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
+ 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ 	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+@@ -124,7 +124,7 @@
+ 	w_class = WEIGHT_CLASS_BULKY
+ 	gas_transfer_coefficient = 0.90
+ 	permeability_coefficient = 0.50
+-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1
+ 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/geiger_counter)
+ 	slowdown = 1.5
@@ -17,7 +17,7 @@
 	resistance_flags = 0

 /obj/item/clothing/under/color/black/ghost
-	flags = NODROP|DROPDEL
+	flags_1 = NODROP_1|DROPDEL_1

 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
@@ -387,7 +387,7 @@

 /obj/item/clothing/under/kilt/highlander
 	desc = "You're the only one worthy of this kilt."
-	flags = NODROP
+	flags_1 = NODROP_1

 /obj/item/clothing/under/sexymime
 	name = "sexy mime outfit"
@@ -81,14 +81,14 @@
 		if(T.Adjacent(user))
 			for(var/B in T)
 				var/atom/movable/AM = B
-				if(HAS_SECONDARY_FLAG(AM, HOLOGRAM))
+				if(AM.flags_2 & HOLOGRAM_2)
 					continue
 				. += AM

 /datum/personal_crafting/proc/get_surroundings(mob/user)
 	. = list()
 	for(var/obj/item/I in get_environment(user))
-		if(HAS_SECONDARY_FLAG(I, HOLOGRAM))
+		if(I.flags_2 & HOLOGRAM_2)
 			continue
 		if(istype(I, /obj/item/stack))
 			var/obj/item/stack/S = I
@@ -0,0 +1,10 @@
+diff a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm	(rejected hunks)
+@@ -96,7 +96,7 @@
+ 		else
+ 			if(istype(I, /obj/item/reagent_containers))
+ 				var/obj/item/reagent_containers/RC = I
+-				if(RC.container_type & OPENCONTAINER)
+				if(RC.container_type & OPENCONTAINER_1)
+ 					for(var/datum/reagent/A in RC.reagents.reagent_list)
+ 						.[A.type] += A.volume
+ 			.[I.type] += 1
@@ -12,8 +12,8 @@
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "rag"
-	flags = NOBLUDGEON
-	container_type = OPENCONTAINER
+	flags_1 = NOBLUDGEON_1
+	container_type = OPENCONTAINER_1
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list()
 	volume = 5
@@ -10,7 +10,7 @@
 	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags = CONDUCT | NOBLUDGEON
+	flags_1 = CONDUCT_1 | NOBLUDGEON_1
 	slot_flags = SLOT_BELT
 	var/scanning = 0
 	var/list/log = list()
@@ -51,7 +51,7 @@
 		SA.key = SG.key

 		SA.grant_language(/datum/language/common)
-		SET_SECONDARY_FLAG(SA, OMNITONGUE)
+		SA.flags_2 |= OMNITONGUE_2

 		SA.sentience_act()

@@ -5,7 +5,7 @@
 	max_occurrences = 3
 	earliest_start = 0

-//Note about adding items to this: Because of how NODROP works if an item spawned to the hands can also be equiped to a slot
+//Note about adding items to this: Because of how NODROP_1 works if an item spawned to the hands can also be equiped to a slot
 //it will be able to be put into that slot from the hand, but then get stuck there. To avoid this make a new subtype of any
 //item you want to equip to the hand, and set its slots_flags = null. Only items equiped to hands need do this.

@@ -51,7 +51,7 @@
 				var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
 				H.temporarilyRemoveItemFromInventory(slots[i], TRUE)
 				H.equip_to_slot_or_del(I, wearslots[i])
-				I.flags |= NODROP
+				I.flags_1 |= NODROP_1
 				I.name = "cursed " + I.name

 	for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
@@ -0,0 +1,10 @@
+diff a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm	(rejected hunks)
+@@ -6,7 +6,7 @@
+ 	icon_state = null
+ 	alpha = 0
+ 	invisibility = INVISIBILITY_ABSTRACT
+-	flags = ABSTRACT|ON_BORDER
+	flags_1 = ABSTRACT_1|ON_BORDER_1
+ 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ 	var/datum/proximity_monitor/advanced/parent = null
+ 
@@ -8,7 +8,7 @@
 	icon_state = null
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
 	possible_transfer_amounts = list(5,10,15,20,25,30,50)
 	volume = 50
@@ -119,8 +119,8 @@
 	materials = list(MAT_METAL=100)
 	possible_transfer_amounts = list()
 	volume = 5
-	flags = CONDUCT
-	container_type = OPENCONTAINER
+	flags_1 = CONDUCT_1
+	container_type = OPENCONTAINER_1
 	spillable = 1
 	resistance_flags = FIRE_PROOF

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm	(rejected hunks)
+@@ -357,7 +357,7 @@
+ /obj/item/reagent_containers/food/drinks/soda_cans/attack_self(mob/user)
+ 	if(!is_open_container())
+ 		to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
+-		container_type = OPENCONTAINER
+		container_type = OPENCONTAINER_1
+ 		playsound(src, "can_open", 50, 1)
+ 		spillable = TRUE
+ 		return
@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm	(rejected hunks)
+@@ -4,7 +4,7 @@
+ /obj/item/reagent_containers/food
+ 	possible_transfer_amounts = list()
+ 	volume = 50	//Sets the default container amount for all food items.
+-	container_type = INJECTABLE
+	container_type = INJECTABLE_1
+ 	resistance_flags = FLAMMABLE
+ 	var/foodtype = NONE
+ 	var/last_check_time
@@ -10,7 +10,7 @@
 	desc = "Just your average condiment container."
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "emptycondiment"
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	possible_transfer_amounts = list(1, 5, 10, 15, 20, 25, 30, 50)
 	volume = 50
 	//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites.
@@ -283,7 +283,7 @@
 	desc = "A simple bowl, used for soups and salads."
 	icon = 'icons/obj/food/soupsalad.dmi'
 	icon_state = "bowl"
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	materials = list(MAT_GLASS = 500)
 	w_class = WEIGHT_CLASS_NORMAL

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm	(rejected hunks)
+@@ -15,7 +15,7 @@ insert ascii eagle on american flag background here
+ 	anchored = TRUE
+ 	use_power = IDLE_POWER_USE
+ 	idle_power_usage = 5
+-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
+ 	var/obj/item/frying = null	//What's being fried RIGHT NOW?
+ 	var/cook_time = 0
+ 	var/static/list/deepfry_blacklisted_items = typecacheof(list(
@@ -157,7 +157,7 @@
 	return

 /obj/machinery/food_cart/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		new /obj/item/stack/sheet/metal(loc, 4)
 	qdel(src)

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm	(rejected hunks)
+@@ -15,7 +15,7 @@
+ 	var/portion = 10
+ 	var/selected_drink
+ 	var/list/stored_food = list()
+-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
+ 	var/obj/item/reagent_containers/mixer
+ 
+ /obj/machinery/food_cart/Initialize()
@@ -220,7 +220,7 @@
 	name = "[M.name] icecream"

 /obj/machinery/icecream_vat/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		new /obj/item/stack/sheet/metal(loc, 4)
 	qdel(src)

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm	(rejected hunks)
+@@ -14,7 +14,7 @@
+ 	anchored = FALSE
+ 	use_power = NO_POWER_USE
+ 	layer = BELOW_OBJ_LAYER
+-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
+ 	max_integrity = 300
+ 	var/list/product_types = list()
+ 	var/dispense_flavour = ICECREAM_VANILLA
@@ -91,7 +91,7 @@
 				src.icon_state = "mw"
 				src.broken = 0 // Fix it!
 				src.dirty = 0 // just to be sure
-				src.container_type = OPENCONTAINER
+				src.container_type = OPENCONTAINER_1
 				return 0 //to use some fuel
 		else
 			to_chat(user, "<span class='warning'>It's broken!</span>")
@@ -108,7 +108,7 @@
 			src.dirty = 0 // It's clean!
 			src.broken = 0 // just to be sure
 			src.icon_state = "mw"
-			src.container_type = OPENCONTAINER
+			src.container_type = OPENCONTAINER_1
 			src.updateUsrDialog()
 			return 1 // Disables the after-attack so we don't spray the floor/user.
 		else
@@ -129,7 +129,7 @@
 			src.dirty = 0 // It's clean!
 			src.broken = 0 // just to be sure
 			src.icon_state = "mw"
-			src.container_type = OPENCONTAINER
+			src.container_type = OPENCONTAINER_1

 	else if(src.dirty==100) // The microwave is all dirty so can't be used!
 		to_chat(user, "<span class='warning'>It's dirty!</span>")
@@ -321,7 +321,7 @@
 	icon_state = "mwb" // Make it look all busted up and shit
 	visible_message("<span class='warning'>The microwave breaks!</span>") //Let them know they're stupid
 	broken = 2 // Make it broken so it can't be used util fixed
-	flags = null //So you can't add condiments
+	flags_1 = null //So you can't add condiments
 	operating = FALSE // Turn it off again aferwards
 	updateUsrDialog()

@@ -12,7 +12,7 @@
 	icon = 'icons/obj/playing_cards.dmi'
 	icon_state = "deck"
 	w_class = WEIGHT_CLASS_SMALL
-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1

 	var/list/cards = list()

@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs",
 			M.power_change()

 	if(holoitem)
-		SET_SECONDARY_FLAG(O, HOLOGRAM)
+		O.flags_2 |= HOLOGRAM_2
 	return O


@@ -247,9 +247,9 @@
 	// this is an exercise left to others I'm afraid.  -Sayu
 	spawned = A.copy_contents_to(linked, 1, nerf_weapons = !emagged)
 	for(var/obj/machinery/M in spawned)
-		M.flags |= NODECONSTRUCT
+		M.flags_1 |= NODECONSTRUCT_1
 	for(var/obj/structure/S in spawned)
-		S.flags |= NODECONSTRUCT
+		S.flags_1 |= NODECONSTRUCT_1
 	effects = list()

 	addtimer(CALLBACK(src, .proc/finish_spawn), 30)
@@ -264,9 +264,9 @@
 			spawned += x // holocarp are not forever
 			added += x
 	for(var/obj/machinery/M in added)
-		M.flags |= NODECONSTRUCT
+		M.flags_1 |= NODECONSTRUCT_1
 	for(var/obj/structure/S in added)
-		S.flags |= NODECONSTRUCT
+		S.flags_1 |= NODECONSTRUCT_1

 /obj/machinery/computer/holodeck/proc/derez(obj/O, silent = TRUE, forced = FALSE)
 	// Emagging a machine creates an anomaly in the derez systems.
@@ -204,7 +204,7 @@
 	eventstarted = TRUE

 	for(var/obj/structure/window/W in currentarea)
-		if(W.flags&NODECONSTRUCT) // Just in case: only holo-windows
+		if(W.flags_1&NODECONSTRUCT_1) // Just in case: only holo-windows
 			qdel(W)

 	for(var/mob/M in currentarea)
@@ -3,7 +3,7 @@
 	thermal_conductivity = 0
 	broken_states = list("engine")
 	burnt_states = list("engine")
-	flags = NONE
+	flags_1 = NONE

 /turf/open/floor/holofloor/attackby(obj/item/I, mob/living/user)
 	return // HOLOFLOOR DOES NOT GIVE A FUCK
@@ -18,7 +18,7 @@
 /mob/living/carbon/human/bee_friendly()
 	if(dna && dna.species && dna.species.id == "pod") //bees pollinate plants, duh.
 		return 1
-	if((wear_suit && (wear_suit.flags & THICKMATERIAL)) && (head && (head.flags & THICKMATERIAL)))
+	if((wear_suit && (wear_suit.flags_1 & THICKMATERIAL_1)) && (head && (head.flags_1 & THICKMATERIAL_1)))
 		return 1
 	return 0

@@ -4,7 +4,7 @@
 	desc = "Keeps the lil buzzing buggers out of your eyes."
 	icon_state = "beekeeper"
 	item_state = "beekeeper"
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1


 /obj/item/clothing/suit/beekeeper_suit
@@ -12,5 +12,5 @@
 	desc = "Keeps the lil buzzing buggers away from your squishy bits."
 	icon_state = "beekeeper"
 	item_state = "beekeeper"
-	flags = THICKMATERIAL
+	flags_1 = THICKMATERIAL_1

@@ -147,7 +147,7 @@
 	if(W.is_hot())
 		StartBurning()
 	if(grill)
-		if(user.a_intent != INTENT_HARM && !(W.flags & ABSTRACT))
+		if(user.a_intent != INTENT_HARM && !(W.flags_1 & ABSTRACT_1))
 			if(user.temporarilyRemoveItemFromInventory(W))
 				W.forceMove(get_turf(src))
 				var/list/click_params = params2list(params)
@@ -23,7 +23,7 @@
 	icon_state = "weedspray"
 	item_state = "spray"
 	volume = 100
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	slot_flags = SLOT_BELT
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
@@ -47,7 +47,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	slot_flags = SLOT_BELT
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
@@ -71,7 +71,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	origin_tech = "engineering=2;biotech=2"
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	force = 5
 	throwforce = 7
 	w_class = WEIGHT_CLASS_SMALL
@@ -87,7 +87,7 @@
 	item_state = "hatchet"
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	force = 12
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 15
@@ -115,7 +115,7 @@
 	throw_speed = 2
 	throw_range = 3
 	w_class = WEIGHT_CLASS_BULKY
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	armour_penetration = 20
 	slot_flags = SLOT_BACK
 	origin_tech = "materials=3;combat=2"
@@ -29,7 +29,7 @@
 	name = "explorer gas mask"
 	desc = "A military-grade gas mask that can be connected to an air supply."
 	icon_state = "gas_mining"
-	visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	visor_flags = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
 	visor_flags_inv = HIDEFACIALHAIR
 	visor_flags_cover = MASKCOVERSMOUTH
 	actions_types = list(/datum/action/item_action/adjust)
@@ -7,7 +7,7 @@
 	singular_name = "hide plate"
 	max_amount = 6
 	novariants = FALSE
-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1
 	w_class = WEIGHT_CLASS_NORMAL
 	layer = MOB_LAYER
 	var/static/list/goliath_platable_armor_typecache = typecacheof(list(
@@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
 	update_icon()

 /obj/structure/marker_beacon/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		var/obj/item/stack/marker_beacon/M = new(loc)
 		M.picked_color = picked_color
 		M.update_icon()
@@ -7,7 +7,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BELT
 	var/cooldown = 35
 	var/current_cooldown = 0
@@ -37,7 +37,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BELT
 	var/cooldown = 35
 	var/current_cooldown = 0
@@ -3,7 +3,7 @@
 	name = "pickaxe"
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "pickaxe"
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BELT | SLOT_BACK
 	force = 15
 	throwforce = 10
@@ -93,7 +93,7 @@
 	icon_state = "shovel"
 	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BELT
 	force = 8
 	var/digspeed = 20
@@ -0,0 +1,19 @@
+diff a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm	(rejected hunks)
+@@ -62,7 +62,7 @@
+ /obj/item/pickaxe/drill/cyborg
+ 	name = "cyborg mining drill"
+ 	desc = "An integrated electric mining drill."
+-	flags = NODROP
+	flags_1 = NODROP_1
+ 
+ /obj/item/pickaxe/drill/diamonddrill
+ 	name = "diamond-tipped mining drill"
+@@ -72,7 +72,7 @@
+ 	desc = "Yours is the drill that will pierce the heavens!"
+ 
+ /obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
+-	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics.
+	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP_1 flag, and easier to change borg specific drill mechanics.
+ 	icon_state = "diamonddrill"
+ 	digspeed = 7
+ 
@@ -22,7 +22,7 @@
 	name = "regenerative core"
 	desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness."
 	icon_state = "roro core 2"
-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1
 	slot = "hivecore"
 	force = 0
 	actions_types = list(/datum/action/item_action/organ_action/use)
@@ -0,0 +1,35 @@
+diff a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm	(rejected hunks)
+@@ -167,7 +167,7 @@
+ 	pixel_y = -32
+ 
+ /obj/item/device/gps/computer/attackby(obj/item/W, mob/user, params)
+-	if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
+	if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
+ 		playsound(src.loc, W.usesound, 50, 1)
+ 		user.visible_message("<span class='warning'>[user] disassembles the gps.</span>", \
+ 						"<span class='notice'>You start to disassemble the gps...</span>", "You hear clanking and banging noises.")
+@@ -198,7 +198,7 @@
+ 	light_color = "#DDFFD3"
+ 	max_n_of_items = 10
+ 	pixel_y = -4
+-	flags = NODECONSTRUCT
+	flags_1 = NODECONSTRUCT_1
+ 	var/empty = FALSE
+ 
+ /obj/machinery/smartfridge/survival_pod/Initialize(mapload)
+@@ -237,13 +237,13 @@
+ 	CanAtmosPass = ATMOS_PASS_NO
+ 
+ /obj/structure/fans/deconstruct()
+-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
+ 		if(buildstacktype)
+ 			new buildstacktype(loc,buildstackamount)
+ 	qdel(src)
+ 
+ /obj/structure/fans/attackby(obj/item/W, mob/user, params)
+-	if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
+	if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
+ 		playsound(src.loc, W.usesound, 50, 1)
+ 		user.visible_message("<span class='warning'>[user] disassembles the fan.</span>", \
+ 						"<span class='notice'>You start to disassemble the fan...</span>", "You hear clanking and banging noises.")
@@ -265,7 +265,7 @@
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	fire_sound = 'sound/weapons/batonextend.ogg'
 	max_charges = 1
-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1
 	force = 18

 /obj/item/ammo_casing/magic/hook
@@ -690,7 +690,7 @@
 	item_state = "spectral"
 	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 = 1
@@ -311,7 +311,7 @@
 	icon = 'icons/obj/economy.dmi'
 	name = "coin"
 	icon_state = "coin__heads"
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	force = 1
 	throwforce = 2
 	w_class = WEIGHT_CLASS_TINY
@@ -4,7 +4,7 @@
 	var/ready = 0
 	var/spawning = 0//Referenced when you want to delete the new_player later on in the code.

-	flags = NONE
+	flags_1 = NONE

 	invisibility = INVISIBILITY_ABSTRACT

@@ -109,7 +109,7 @@
 	if(href_list["ready"])
 		var/tready = text2num(href_list["ready"])
 		//Avoid updating ready if we're after PREGAME (they should use latejoin instead)
-		//This is likely not an actual issue but I don't have time to prove that this 
+		//This is likely not an actual issue but I don't have time to prove that this
 		//no longer is required
 		if(SSticker.current_state <= GAME_STATE_PREGAME)
 			ready = tready
@@ -182,7 +182,7 @@


 /mob/proc/put_in_hand_check(obj/item/I)
-	if(lying && !(I.flags&ABSTRACT))
+	if(lying && !(I.flags_1&ABSTRACT_1))
 		return FALSE
 	if(!istype(I))
 		return FALSE
@@ -252,7 +252,7 @@
 /mob/proc/canUnEquip(obj/item/I, force)
 	if(!I)
 		return TRUE
-	if((I.flags & NODROP) && !force)
+	if((I.flags_1 & NODROP_1) && !force)
 		return FALSE
 	return TRUE

@@ -286,13 +286,13 @@
 //DO NOT CALL THIS PROC
 //use one of the above 2 helper procs
 //you may override it, but do not modify the args
-/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE) //Force overrides NODROP for things like wizarditis and admin undress.
+/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE) //Force overrides NODROP_1 for things like wizarditis and admin undress.
 													//Use no_move if the item is just gonna be immediately moved afterward
 													//Invdrop is used to prevent stuff in pockets dropping. only set to false if it's going to immediately be replaced
-	if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for NODROP.
+	if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for NODROP_1.
 		return TRUE

-	if((I.flags & NODROP) && !force)
+	if((I.flags_1 & NODROP_1) && !force)
 		return FALSE

 	var/hand_index = get_held_index_of_item(I)
@@ -305,7 +305,7 @@
 		I.layer = initial(I.layer)
 		I.plane = initial(I.plane)
 		I.appearance_flags &= ~NO_CLIENT_COLOR
-		if(!no_move && !(I.flags & DROPDEL))	//item may be moved/qdel'd immedietely, don't bother moving it
+		if(!no_move && !(I.flags_1 & DROPDEL_1))	//item may be moved/qdel'd immedietely, don't bother moving it
 			I.forceMove(newloc)
 		I.dropped(src)
 	return TRUE
@@ -138,7 +138,7 @@
 	name = "blood crawl"
 	desc = "You are unable to hold anything while in this form."
 	icon = 'icons/effects/blood.dmi'
-	flags = NODROP|ABSTRACT
+	flags_1 = NODROP_1|ABSTRACT_1

 /mob/living/proc/exit_blood_effect(obj/effect/decal/cleanable/B)
 	playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm	(rejected hunks)
+@@ -167,7 +167,7 @@
+ 	if(iscarbon(src))
+ 		var/mob/living/carbon/C = src
+ 		for(var/obj/item/bloodcrawl/BC in C)
+-			BC.flags = null
+			BC.flags_1 = null
+ 			qdel(BC)
+ 	qdel(src.holder)
+ 	src.holder = null
@@ -112,7 +112,7 @@
 	if(user.zone_selected != "head")
 		return ..()

-	if((C.head && (C.head.flags_cover & HEADCOVERSEYES)) || (C.wear_mask && (C.wear_mask.flags_cover & MASKCOVERSEYES)) || (C.glasses && (C.glasses.flags & GLASSESCOVERSEYES)))
+	if((C.head && (C.head.flags_cover & HEADCOVERSEYES)) || (C.wear_mask && (C.wear_mask.flags_cover & MASKCOVERSEYES)) || (C.glasses && (C.glasses.flags_1 & GLASSESCOVERSEYES)))
 		to_chat(user, "<span class='warning'>You're going to need to remove their head cover first!</span>")
 		return

@@ -42,7 +42,7 @@
 	<HR>"}
 	for(var/i in 1 to held_items.len)
 		var/obj/item/I = get_item_for_held_index(i)
-		dat += "<BR><B>[get_held_index_name(i)]:</B><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags & ABSTRACT)) ? I : "<font color=grey>Empty</font>"]</a>"
+		dat += "<BR><B>[get_held_index_name(i)]:</B><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "<font color=grey>Empty</font>"]</a>"
 	dat += "<BR><A href='?src=\ref[src];pouches=1'>Empty Pouches</A>"

 	if(handcuffed)
@@ -123,7 +123,7 @@
 	name = "\improper royal parasite"
 	desc = "Inject this into one of your grown children to promote her to a Praetorian!"
 	icon_state = "alien_medal"
-	flags = ABSTRACT|NODROP|DROPDEL
+	flags_1 = ABSTRACT_1|NODROP_1|DROPDEL_1
 	icon = 'icons/mob/alien.dmi'

 /obj/item/queenpromote/attack(mob/living/M, mob/living/carbon/alien/humanoid/user)
@@ -15,7 +15,7 @@
 	icon_state = "facehugger"
 	item_state = "facehugger"
 	w_class = WEIGHT_CLASS_TINY //note: can be picked up by aliens unlike most other items of w_class below 4
-	flags = MASKINTERNALS
+	flags_1 = MASKINTERNALS_1
 	throw_range = 5
 	tint = 3
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
@@ -165,7 +165,7 @@
 					var/end_T_descriptor = "<font color='#6b4400'>tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]</font>"
 					add_logs(src, throwable_mob, "thrown", addition="from [start_T_descriptor] with the target [end_T_descriptor]")

-	else if(!(I.flags & (NODROP|ABSTRACT)))
+	else if(!(I.flags_1 & (NODROP_1|ABSTRACT_1)))
 		thrown_thing = I
 		dropItemToGround(I)

@@ -187,13 +187,13 @@
 	<HR>
 	<B><FONT size=3>[name]</FONT></B>
 	<HR>
-	<BR><B>Head:</B> <A href='?src=\ref[src];item=[slot_head]'>				[(head && !(head.flags&ABSTRACT)) 			? head 		: "Nothing"]</A>
-	<BR><B>Mask:</B> <A href='?src=\ref[src];item=[slot_wear_mask]'>		[(wear_mask && !(wear_mask.flags&ABSTRACT))	? wear_mask	: "Nothing"]</A>
-	<BR><B>Neck:</B> <A href='?src=\ref[src];item=[slot_neck]'>		[(wear_neck && !(wear_neck.flags&ABSTRACT))	? wear_neck	: "Nothing"]</A>"}
+	<BR><B>Head:</B> <A href='?src=\ref[src];item=[slot_head]'>				[(head && !(head.flags_1&ABSTRACT_1)) 			? head 		: "Nothing"]</A>
+	<BR><B>Mask:</B> <A href='?src=\ref[src];item=[slot_wear_mask]'>		[(wear_mask && !(wear_mask.flags_1&ABSTRACT_1))	? wear_mask	: "Nothing"]</A>
+	<BR><B>Neck:</B> <A href='?src=\ref[src];item=[slot_neck]'>		[(wear_neck && !(wear_neck.flags_1&ABSTRACT_1))	? wear_neck	: "Nothing"]</A>"}

 	for(var/i in 1 to held_items.len)
 		var/obj/item/I = get_item_for_held_index(i)
-		dat += "<BR><B>[get_held_index_name(i)]:</B></td><td><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags & ABSTRACT)) ? I : "Nothing"]</a>"
+		dat += "<BR><B>[get_held_index_name(i)]:</B></td><td><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "Nothing"]</a>"

 	dat += "<BR><B>Back:</B> <A href='?src=\ref[src];item=[slot_back]'>[back ? back : "Nothing"]</A>"

@@ -393,7 +393,7 @@
 		return initial(pixel_y)

 /mob/living/carbon/proc/accident(obj/item/I)
-	if(!I || (I.flags & (NODROP|ABSTRACT)))
+	if(!I || (I.flags_1 & (NODROP_1|ABSTRACT_1)))
 		return

 	dropItemToGround(I)
@@ -0,0 +1,19 @@
+diff a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm	(rejected hunks)
+@@ -213,7 +213,7 @@
+ 		if(href_list["internal"])
+ 			var/slot = text2num(href_list["internal"])
+ 			var/obj/item/ITEM = get_item_by_slot(slot)
+-			if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.flags & MASKINTERNALS))
+			if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1))
+ 				visible_message("<span class='danger'>[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].</span>", \
+ 								"<span class='userdanger'>[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].</span>")
+ 				if(do_mob(usr, src, POCKET_STRIP_DELAY))
+@@ -221,7 +221,7 @@
+ 						internal = null
+ 						update_internals_hud_icon(0)
+ 					else if(ITEM && istype(ITEM, /obj/item/tank))
+-						if((wear_mask && (wear_mask.flags & MASKINTERNALS)) || getorganslot("breathing_tube"))
+						if((wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1)) || getorganslot("breathing_tube"))
+ 							internal = ITEM
+ 							update_internals_hud_icon(1)
+ 
@@ -24,9 +24,9 @@

 /mob/living/carbon/get_ear_protection()
 	var/number = ..()
-	if(ears && HAS_SECONDARY_FLAG(ears, BANG_PROTECT))
+	if(ears && (ears.flags_2 & BANG_PROTECT_2))
 		number += 1
-	if(head && HAS_SECONDARY_FLAG(head, BANG_PROTECT))
+	if(head && (head.flags_2 & BANG_PROTECT_2))
 		number += 1
 	var/obj/item/organ/ears/E = getorganslot("ears")
 	if(!E)
@@ -210,7 +210,7 @@
 	..()

 /mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, override = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
-	if(tesla_shock && HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
+	if(tesla_shock && (flags_2 & TESLA_IGNORE_2))
 		return FALSE
 	shock_damage *= siemens_coeff
 	if(dna && dna.species)
@@ -18,7 +18,7 @@
 		msg += "[t_He] [t_is] wearing [icon2html(wear_neck, user)] \a [src.wear_neck] around [t_his] neck.\n"

 	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'>[t_He] [t_is] holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in [t_his] [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
 			else
@@ -56,7 +56,7 @@

 	//Hands
 	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'>[t_He] [t_is] holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in [t_his] [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
 			else
@@ -275,11 +275,11 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 			var/obj/item/place_item = usr.get_active_held_item() // Item to place in the pocket, if it's empty

 			var/delay_denominator = 1
-			if(pocket_item && !(pocket_item.flags&ABSTRACT))
-				if(pocket_item.flags & NODROP)
+			if(pocket_item && !(pocket_item.flags_1&ABSTRACT_1))
+				if(pocket_item.flags_1 & NODROP_1)
 					to_chat(usr, "<span class='warning'>You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!</span>")
 				to_chat(usr, "<span class='notice'>You try to empty [src]'s [pocket_side] pocket.</span>")
-			else if(place_item && place_item.mob_can_equip(src, usr, pocket_id, 1) && !(place_item.flags&ABSTRACT))
+			else if(place_item && place_item.mob_can_equip(src, usr, pocket_id, 1) && !(place_item.flags_1&ABSTRACT_1))
 				to_chat(usr, "<span class='notice'>You try to place [place_item] into [src]'s [pocket_side] pocket.</span>")
 				delay_denominator = 4
 			else
@@ -525,10 +525,10 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	// If targeting the head, see if the head item is thin enough.
 	// If targeting anything else, see if the wear suit is thin enough.
 	if(above_neck(target_zone))
-		if(head && head.flags & THICKMATERIAL && !penetrate_thick)
+		if(head && head.flags_1 & THICKMATERIAL_1 && !penetrate_thick)
 			. = 0
 	else
-		if(wear_suit && wear_suit.flags & THICKMATERIAL && !penetrate_thick)
+		if(wear_suit && wear_suit.flags_1 & THICKMATERIAL_1 && !penetrate_thick)
 			. = 0
 	if(!. && error_msg && user)
 		// Might need re-wording.
@@ -0,0 +1,91 @@
+diff a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm	(rejected hunks)
+@@ -141,42 +141,42 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
+ 	dat += "<table>"
+ 	for(var/i in 1 to held_items.len)
+ 		var/obj/item/I = get_item_for_held_index(i)
+-		dat += "<tr><td><B>[get_held_index_name(i)]:</B></td><td><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags & ABSTRACT)) ? I : "<font color=grey>Empty</font>"]</a></td></tr>"
+		dat += "<tr><td><B>[get_held_index_name(i)]:</B></td><td><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "<font color=grey>Empty</font>"]</a></td></tr>"
+ 	dat += "<tr><td>&nbsp;</td></tr>"
+ 
+-	dat += "<tr><td><B>Back:</B></td><td><A href='?src=\ref[src];item=[slot_back]'>[(back && !(back.flags&ABSTRACT)) ? back : "<font color=grey>Empty</font>"]</A>"
+	dat += "<tr><td><B>Back:</B></td><td><A href='?src=\ref[src];item=[slot_back]'>[(back && !(back.flags_1&ABSTRACT_1)) ? back : "<font color=grey>Empty</font>"]</A>"
+ 	if(has_breathable_mask && istype(back, /obj/item/tank))
+ 		dat += "&nbsp;<A href='?src=\ref[src];internal=[slot_back]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
+ 
+ 	dat += "</td></tr><tr><td>&nbsp;</td></tr>"
+ 
+-	dat += "<tr><td><B>Head:</B></td><td><A href='?src=\ref[src];item=[slot_head]'>[(head && !(head.flags&ABSTRACT)) ? head : "<font color=grey>Empty</font>"]</A></td></tr>"
+	dat += "<tr><td><B>Head:</B></td><td><A href='?src=\ref[src];item=[slot_head]'>[(head && !(head.flags_1&ABSTRACT_1)) ? head : "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if(slot_wear_mask in obscured)
+ 		dat += "<tr><td><font color=grey><B>Mask:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+ 	else
+-		dat += "<tr><td><B>Mask:</B></td><td><A href='?src=\ref[src];item=[slot_wear_mask]'>[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td><B>Mask:</B></td><td><A href='?src=\ref[src];item=[slot_wear_mask]'>[(wear_mask && !(wear_mask.flags_1&ABSTRACT_1)) ? wear_mask : "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if(slot_neck in obscured)
+ 		dat += "<tr><td><font color=grey><B>Neck:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+ 	else
+-		dat += "<tr><td><B>Neck:</B></td><td><A href='?src=\ref[src];item=[slot_neck]'>[(wear_neck && !(wear_neck.flags&ABSTRACT)) ? wear_neck : "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td><B>Neck:</B></td><td><A href='?src=\ref[src];item=[slot_neck]'>[(wear_neck && !(wear_neck.flags_1&ABSTRACT_1)) ? wear_neck : "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if(slot_glasses in obscured)
+ 		dat += "<tr><td><font color=grey><B>Eyes:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+ 	else
+-		dat += "<tr><td><B>Eyes:</B></td><td><A href='?src=\ref[src];item=[slot_glasses]'>[(glasses && !(glasses.flags&ABSTRACT))	? glasses : "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td><B>Eyes:</B></td><td><A href='?src=\ref[src];item=[slot_glasses]'>[(glasses && !(glasses.flags_1&ABSTRACT_1))	? glasses : "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if(slot_ears in obscured)
+ 		dat += "<tr><td><font color=grey><B>Ears:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+ 	else
+-		dat += "<tr><td><B>Ears:</B></td><td><A href='?src=\ref[src];item=[slot_ears]'>[(ears && !(ears.flags&ABSTRACT))		? ears		: "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td><B>Ears:</B></td><td><A href='?src=\ref[src];item=[slot_ears]'>[(ears && !(ears.flags_1&ABSTRACT_1))		? ears		: "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	dat += "<tr><td>&nbsp;</td></tr>"
+ 
+-	dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=\ref[src];item=[slot_wear_suit]'>[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "<font color=grey>Empty</font>"]</A></td></tr>"
+	dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=\ref[src];item=[slot_wear_suit]'>[(wear_suit && !(wear_suit.flags_1&ABSTRACT_1)) ? wear_suit : "<font color=grey>Empty</font>"]</A></td></tr>"
+ 	if(wear_suit)
+-		dat += "<tr><td>&nbsp;&#8627;<B>Suit Storage:</B></td><td><A href='?src=\ref[src];item=[slot_s_store]'>[(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "<font color=grey>Empty</font>"]</A>"
+		dat += "<tr><td>&nbsp;&#8627;<B>Suit Storage:</B></td><td><A href='?src=\ref[src];item=[slot_s_store]'>[(s_store && !(s_store.flags_1&ABSTRACT_1)) ? s_store : "<font color=grey>Empty</font>"]</A>"
+ 		if(has_breathable_mask && istype(s_store, /obj/item/tank))
+ 			dat += "&nbsp;<A href='?src=\ref[src];internal=[slot_s_store]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
+ 		dat += "</td></tr>"
+@@ -186,30 +186,30 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
+ 	if(slot_shoes in obscured)
+ 		dat += "<tr><td><font color=grey><B>Shoes:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+ 	else
+-		dat += "<tr><td><B>Shoes:</B></td><td><A href='?src=\ref[src];item=[slot_shoes]'>[(shoes && !(shoes.flags&ABSTRACT))		? shoes		: "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td><B>Shoes:</B></td><td><A href='?src=\ref[src];item=[slot_shoes]'>[(shoes && !(shoes.flags_1&ABSTRACT_1))		? shoes		: "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if(slot_gloves in obscured)
+ 		dat += "<tr><td><font color=grey><B>Gloves:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+ 	else
+-		dat += "<tr><td><B>Gloves:</B></td><td><A href='?src=\ref[src];item=[slot_gloves]'>[(gloves && !(gloves.flags&ABSTRACT))		? gloves	: "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td><B>Gloves:</B></td><td><A href='?src=\ref[src];item=[slot_gloves]'>[(gloves && !(gloves.flags_1&ABSTRACT_1))		? gloves	: "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if(slot_w_uniform in obscured)
+ 		dat += "<tr><td><font color=grey><B>Uniform:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+ 	else
+-		dat += "<tr><td><B>Uniform:</B></td><td><A href='?src=\ref[src];item=[slot_w_uniform]'>[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? w_uniform : "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td><B>Uniform:</B></td><td><A href='?src=\ref[src];item=[slot_w_uniform]'>[(w_uniform && !(w_uniform.flags_1&ABSTRACT_1)) ? w_uniform : "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (slot_w_uniform in obscured))
+ 		dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Pockets:</B></font></td></tr>"
+ 		dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>ID:</B></font></td></tr>"
+ 		dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Belt:</B></font></td></tr>"
+ 	else
+-		dat += "<tr><td>&nbsp;&#8627;<B>Belt:</B></td><td><A href='?src=\ref[src];item=[slot_belt]'>[(belt && !(belt.flags&ABSTRACT)) ? belt : "<font color=grey>Empty</font>"]</A>"
+		dat += "<tr><td>&nbsp;&#8627;<B>Belt:</B></td><td><A href='?src=\ref[src];item=[slot_belt]'>[(belt && !(belt.flags_1&ABSTRACT_1)) ? belt : "<font color=grey>Empty</font>"]</A>"
+ 		if(has_breathable_mask && istype(belt, /obj/item/tank))
+ 			dat += "&nbsp;<A href='?src=\ref[src];internal=[slot_belt]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
+ 		dat += "</td></tr>"
+-		dat += "<tr><td>&nbsp;&#8627;<B>Pockets:</B></td><td><A href='?src=\ref[src];pockets=left'>[(l_store && !(l_store.flags&ABSTRACT)) ? "Left (Full)" : "<font color=grey>Left (Empty)</font>"]</A>"
+-		dat += "&nbsp;<A href='?src=\ref[src];pockets=right'>[(r_store && !(r_store.flags&ABSTRACT)) ? "Right (Full)" : "<font color=grey>Right (Empty)</font>"]</A></td></tr>"
+-		dat += "<tr><td>&nbsp;&#8627;<B>ID:</B></td><td><A href='?src=\ref[src];item=[slot_wear_id]'>[(wear_id && !(wear_id.flags&ABSTRACT)) ? wear_id : "<font color=grey>Empty</font>"]</A></td></tr>"
+		dat += "<tr><td>&nbsp;&#8627;<B>Pockets:</B></td><td><A href='?src=\ref[src];pockets=left'>[(l_store && !(l_store.flags_1&ABSTRACT_1)) ? "Left (Full)" : "<font color=grey>Left (Empty)</font>"]</A>"
+		dat += "&nbsp;<A href='?src=\ref[src];pockets=right'>[(r_store && !(r_store.flags_1&ABSTRACT_1)) ? "Right (Full)" : "<font color=grey>Right (Empty)</font>"]</A></td></tr>"
+		dat += "<tr><td>&nbsp;&#8627;<B>ID:</B></td><td><A href='?src=\ref[src];item=[slot_wear_id]'>[(wear_id && !(wear_id.flags_1&ABSTRACT_1)) ? wear_id : "<font color=grey>Empty</font>"]</A></td></tr>"
+ 
+ 	if(handcuffed)
+ 		dat += "<tr><td><B>Handcuffed:</B> <A href='?src=\ref[src];item=[slot_handcuffed]'>Remove</A></td></tr>"
@@ -442,7 +442,7 @@
 			else if(S.siemens_coefficient == (-1))
 				total_coeff -= 1
 		siemens_coeff = total_coeff
-		if(HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
+		if(flags_2 & TESLA_IGNORE_2)
 			siemens_coeff = 0
 	else if(!safety)
 		var/gloves_siemens_coeff = 1
@@ -94,10 +94,10 @@
 /mob/living/carbon/human/abiotic(full_body = 0)
 	var/abiotic_hands = FALSE
 	for(var/obj/item/I in held_items)
-		if(!(I.flags & NODROP))
+		if(!(I.flags_1 & NODROP_1))
 			abiotic_hands = TRUE
 			break
-	if(full_body && abiotic_hands && ((back && !(back.flags&NODROP)) || (wear_mask && !(wear_mask.flags&NODROP)) || (head && !(head.flags&NODROP)) || (shoes && !(shoes.flags&NODROP)) || (w_uniform && !(w_uniform.flags&NODROP)) || (wear_suit && !(wear_suit.flags&NODROP)) || (glasses && !(glasses.flags&NODROP)) || (ears && !(ears.flags&NODROP)) || (gloves && !(gloves.flags&NODROP)) ) )
+	if(full_body && abiotic_hands && ((back && !(back.flags_1&NODROP_1)) || (wear_mask && !(wear_mask.flags_1&NODROP_1)) || (head && !(head.flags_1&NODROP_1)) || (shoes && !(shoes.flags_1&NODROP_1)) || (w_uniform && !(w_uniform.flags_1&NODROP_1)) || (wear_suit && !(wear_suit.flags_1&NODROP_1)) || (glasses && !(glasses.flags_1&NODROP_1)) || (ears && !(ears.flags_1&NODROP_1)) || (gloves && !(gloves.flags_1&NODROP_1)) ) )
 		return TRUE
 	return abiotic_hands

--- a/Show More
+++ b/Show More