Revert "12/21 modernizations from TG live"

code/game/objects/items/weapons/storage/fancy.dm

@@ -17,10 +17,9 @@
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	var/icon_type = "donut"
 	var/spawn_type = null
-	var/fancy_open = FALSE
 
 /obj/item/weapon/storage/fancy/New()
 	..()
@@ -28,37 +27,16 @@
 		new spawn_type(src)
 
 /obj/item/weapon/storage/fancy/update_icon(itemremoved = 0)
-	if(fancy_open)
-		var/total_contents = src.contents.len - itemremoved
-		icon_state = "[icon_type]box[total_contents]"
-	else
-		icon_state = "[icon_type]box"
+	var/total_contents = src.contents.len - itemremoved
+	src.icon_state = "[src.icon_type]box[total_contents]"
+	return
 
 /obj/item/weapon/storage/fancy/examine(mob/user)
 	..()
-	if(fancy_open)
-		if(contents.len == 1)
-			user << "There is one [src.icon_type] left."
-		else
-			user << "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left."
-
-/obj/item/weapon/storage/fancy/attack_self(mob/user)
-	fancy_open = !fancy_open
-	update_icon()
-
-/obj/item/weapon/storage/fancy/content_can_dump(atom/dest_object, mob/user)
-	. = ..()
-	if(.)
-		fancy_open = TRUE
-		update_icon()
-
-/obj/item/weapon/storage/fancy/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user)
-	fancy_open = TRUE
-	return ..()
-
-/obj/item/weapon/storage/fancy/remove_from_storage(obj/item/W, atom/new_location, burn = 0)
-	fancy_open = TRUE
-	return ..()
+	if(contents.len == 1)
+		user << "There is one [src.icon_type] left."
+	else
+		user << "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left."
 
 /*
  * Donut Box
@@ -72,7 +50,6 @@
 	storage_slots = 6
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
 	spawn_type = /obj/item/weapon/reagent_containers/food/snacks/donut
-	fancy_open = TRUE
 
 /*
  * Egg Box
@@ -102,10 +79,6 @@
 	throwforce = 2
 	slot_flags = SLOT_BELT
 	spawn_type = /obj/item/candle
-	fancy_open = TRUE
-
-/obj/item/weapon/storage/fancy/candle_box/attack_self(mob_user)
-	return
 
 ////////////
 //CIG PACK//
@@ -116,7 +89,7 @@
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig"
 	item_state = "cigpacket"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	throwforce = 0
 	slot_flags = SLOT_BELT
 	storage_slots = 6
@@ -132,39 +105,21 @@
 		cig.desc = "\An [name] brand [cig.name]."
 	name = "\improper [name] packet"
 
-/obj/item/weapon/storage/fancy/cigarettes/AltClick(mob/user)
-	if(user.get_active_held_item())
-		return
-	for(var/obj/item/weapon/lighter/lighter in src)
-		remove_from_storage(lighter, user.loc)
-		user.put_in_active_hand(lighter)
-		break
-
 /obj/item/weapon/storage/fancy/cigarettes/update_icon()
-	if(fancy_open || !contents.len)
-		cut_overlays()
-		if(!contents.len)
-			icon_state = "[initial(icon_state)]_empty"
-		else
-			icon_state = initial(icon_state)
-			add_overlay("[icon_state]_open")
-			var/i = contents.len
-			for(var/C in contents)
-				if(istype(C, /obj/item/weapon/lighter/greyscale))
-					add_overlay(image(icon = src.icon, icon_state = "lighter_in", pixel_x = 1 * (i -1)))
-				else if(istype(C, /obj/item/weapon/lighter))
-					add_overlay(image(icon = src.icon, icon_state = "zippo_in", pixel_x = 1 * (i -1)))
-				else
-					add_overlay(image(icon = src.icon, icon_state = "cigarette", pixel_x = 1 * (i -1)))
-				i--
+	cut_overlays()
+	icon_state = initial(icon_state)
+	if(!contents.len)
+		icon_state += "_empty"
 	else
-		cut_overlays()
+		add_overlay("[icon_state]_open")
+		for(var/c = contents.len, c >= 1, c--)
+			add_overlay(image(icon = src.icon, icon_state = "cigarette", pixel_x = 1 * (c -1)))
+	return
 
 /obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W, atom/new_location)
 	if(istype(W,/obj/item/clothing/mask/cigarette))
 		if(reagents)
 			reagents.trans_to(W,(reagents.total_volume/contents.len))
-	fancy_open = TRUE
 	..()
 
 /obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -247,7 +202,7 @@
 /obj/item/weapon/storage/fancy/rollingpapers
 	name = "rolling paper pack"
 	desc = "A pack of NanoTrasen brand rolling papers."
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper_pack"
 	storage_slots = 10
@@ -259,6 +214,7 @@
 	cut_overlays()
 	if(!contents.len)
 		add_overlay("[icon_state]_empty")
+	return
 
 /////////////
 //CIGAR BOX//
@@ -269,21 +225,18 @@
 	desc = "A case of premium cigars. Very expensive."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cigarcase"
-	w_class = WEIGHT_CLASS_NORMAL
-	storage_slots = 5
+	w_class = 3
+	storage_slots = 7
 	can_hold = list(/obj/item/clothing/mask/cigarette/cigar)
 	icon_type = "premium cigar"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar
 
 /obj/item/weapon/storage/fancy/cigarettes/cigars/update_icon()
-	if(fancy_open)
-		cut_overlays()
-		add_overlay("[icon_state]_open")
-		for(var/c = contents.len, c >= 1, c--)
-			add_overlay(image(icon = src.icon, icon_state = icon_type, pixel_x = 4 * (c -1)))
-	else
-		cut_overlays()
-		icon_state = "cigarcase"
+	cut_overlays()
+	add_overlay("[icon_state]_open")
+	for(var/c = contents.len, c >= 1, c--)
+		add_overlay(image(icon = src.icon, icon_state = icon_type, pixel_x = 4 * (c -1)))
+	return
 
 /obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba
 	name = "\improper cohiba robusto cigar case"