Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -262,7 +262,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	singular_name = "durathread roll"
 	icon_state = "sheet-durathread"
 	item_state = "sheet-cloth"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	force = 0
 	throwforce = 0
 	merge_type = /obj/item/stack/sheet/durathread
@@ -276,7 +276,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	desc = "A bundle of raw cotton ready to be spun on the loom."
 	singular_name = "raw cotton ball"
 	icon_state = "sheet-cotton"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	force = 0
 	throwforce = 0
 	merge_type = /obj/item/stack/sheet/cotton

code/game/objects/items/toys.dm

@@ -1506,7 +1506,7 @@ obj/item/toy/cards/deck/syndicate/black
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "toy_mouse"
 	w_class = WEIGHT_CLASS_SMALL
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	var/cooldown = 0
 
 /*