Fixes bartender suit having an adjust state

code/game/objects/items/storage/backpack.dm

@@ -21,7 +21,7 @@
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 21
 	storage_slots = 21
-	resistance_flags = 0
+	resistance_flags = NONE
 	max_integrity = 300
 
 /*
@@ -147,7 +147,7 @@
 	desc = "It's a special backpack made exclusively for Nanotrasen officers."
 	icon_state = "captainpack"
 	item_state = "captainpack"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/industrial
 	name = "industrial backpack"
@@ -179,7 +179,7 @@
 	desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
 	icon_state = "toxpack"
 	item_state = "toxpack"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/virology
 	name = "virology backpack"
@@ -202,7 +202,7 @@
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/satchel/leather/withwallet/PopulateContents()
 	new /obj/item/storage/wallet/random(src)
@@ -212,7 +212,7 @@
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
 	item_state = "engiepack"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/satchel/med
 	name = "medical satchel"
@@ -243,7 +243,7 @@
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
 	item_state = "satchel-tox"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/satchel/hyd
 	name = "botanist satchel"
@@ -268,7 +268,7 @@
 	desc = "An exclusive satchel for Nanotrasen officers."
 	icon_state = "satchel-cap"
 	item_state = "captainpack"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/satchel/flat
 	name = "smuggler's satchel"
@@ -335,7 +335,7 @@
 	desc = "A large duffel bag for holding extra captainly goods."
 	icon_state = "duffel-captain"
 	item_state = "duffel-captain"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/duffelbag/med
 	name = "medical duffel bag"
@@ -383,7 +383,7 @@
 	desc = "A large duffel bag for holding extra tools and supplies."
 	icon_state = "duffel-eng"
 	item_state = "duffel-eng"
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/storage/backpack/duffelbag/drone
 	name = "drone duffel bag"

code/game/objects/items/toys.dm

@@ -939,7 +939,7 @@
 	card_throw_speed = 3
 	card_throw_range = 7
 	card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /*
  * Fake nuke

code/game/objects/items/trash.dm

@@ -3,6 +3,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+<<<<<<< HEAD
 	desc = "This is rubbish."
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
@@ -79,4 +80,82 @@
 /obj/item/trash/coal/burn()
 	visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
 	new /obj/item/ore/diamond(loc)
+=======
+	desc = "This is rubbish."
+	w_class = WEIGHT_CLASS_TINY
+	resistance_flags = FLAMMABLE
+
+/obj/item/trash/raisins
+	name = "\improper 4no raisins"
+	icon_state= "4no_raisins"
+
+/obj/item/trash/candy
+	name = "candy"
+	icon_state= "candy"
+
+/obj/item/trash/cheesie
+	name = "cheesie honkers"
+	icon_state = "cheesie_honkers"
+
+/obj/item/trash/chips
+	name = "chips"
+	icon_state = "chips"
+
+/obj/item/trash/popcorn
+	name = "popcorn"
+	icon_state = "popcorn"
+
+/obj/item/trash/sosjerky
+	name = "\improper Scaredy's Private Reserve Beef Jerky"
+	icon_state = "sosjerky"
+
+/obj/item/trash/syndi_cakes
+	name = "syndi-cakes"
+	icon_state = "syndi_cakes"
+
+/obj/item/trash/waffles
+	name = "waffles tray"
+	icon_state = "waffles"
+
+/obj/item/trash/plate
+	name = "plate"
+	icon_state = "plate"
+	resistance_flags = NONE
+
+/obj/item/trash/pistachios
+	name = "pistachios pack"
+	icon_state = "pistachios_pack"
+
+/obj/item/trash/semki
+	name = "semki pack"
+	icon_state = "semki_pack"
+
+/obj/item/trash/tray
+	name = "tray"
+	icon_state = "tray"
+	resistance_flags = NONE
+
+/obj/item/trash/candle
+	name = "candle"
+	icon = 'icons/obj/candle.dmi'
+	icon_state = "candle4"
+
+/obj/item/trash/can
+	name = "crushed can"
+	icon_state = "cola"
+	resistance_flags = NONE
+
+/obj/item/trash/attack(mob/M, mob/living/user)
+	return
+
+/obj/item/trash/coal
+	name = "lump of coal"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "slag"
+	desc = "Someone's gotten on the naughty list."
+
+/obj/item/trash/coal/burn()
+	visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
+	new /obj/item/ore/diamond(loc)
+>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
 	qdel(src)