Legacy Sprites Moar Revive

code/game/objects/items/reagent_containers/food/snacks.dm

@@ -3131,6 +3131,7 @@
 	icon_state = "packaged-burrito"
 	bitesize = 2
 	package = 1
+	flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
 
 /obj/item/reagent_container/food/snacks/packaged_burrito/Initialize()
 	. = ..()
@@ -3174,6 +3175,7 @@
 	name = "Packaged Hotdog"
 	desc = "A singular squishy, room temperature, hot dog. There's no time given for how long to cook it, so you assume its probably good to go. Packaged by the Weyland-Yutani Corporation."
 	icon_state = "packaged-hotdog"
+	flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
 	bitesize = 2
 	package = 1
 

code/game/objects/items/tools/maintenance_tools.dm

@@ -162,6 +162,7 @@
 	drop_sound = 'sound/handling/weldingtool_drop.ogg'
 	flags_atom = FPRINT|CONDUCT
 	flags_equip_slot = SLOT_WAIST
+	var/base_icon_state = ""
 
 	//Amount of OUCH when it's thrown
 	force = 3
@@ -192,6 +193,7 @@
 	. = ..()
 	create_reagents(max_fuel)
 	reagents.add_reagent("fuel", max_fuel)
+	base_icon_state = initial(icon_state)
 	return
 
 /obj/item/tool/weldingtool/Destroy()
@@ -336,7 +338,7 @@
 			weld_tick += 8 //turning the tool on does not consume fuel directly, but it advances the process that regularly consumes fuel.
 			force = 15
 			damtype = "fire"
-			icon_state = "welder1"
+			icon_state = base_icon_state + "_on"
 			w_class = SIZE_LARGE
 			heat_source = 3800
 			START_PROCESSING(SSobj, src)
@@ -348,7 +350,7 @@
 		playsound(loc, 'sound/items/weldingtool_off.ogg', 25)
 		force = 3
 		damtype = "brute"
-		icon_state = "welder"
+		icon_state = base_icon_state
 		welding = 0
 		w_class = initial(w_class)
 		heat_source = 0
@@ -415,6 +417,7 @@
 	name = "industrial blowtorch"
 	max_fuel = 60
 	matter = list("metal" = 70, "glass" = 60)
+	icon_state = "welder_c"
 
 
 /obj/item/tool/weldingtool/hugetank
@@ -442,9 +445,9 @@
 	name = "\improper ME3 hand welder"
 	desc = "A compact, handheld welding torch used by the marines of the United States Colonial Marine Corps for cutting and welding jobs on the field. Due to the small size and slow strength, its function is limited compared to a full-sized technician's blowtorch."
 	max_fuel = 5
-	color = "#cc0000"
 	has_welding_screen = TRUE
 	inherent_traits = list(TRAIT_TOOL_SIMPLE_BLOWTORCH)
+	icon_state = "welder_b"
 
 /*
  * Crowbar

code/game/objects/items/tools/surgery_tools.dm

@@ -235,7 +235,7 @@
 /obj/item/tool/surgery/surgical_line
 	name = "\proper surgical line"
 	desc = "A roll of military-grade surgical line, able to seamlessly sew up any wound. Also works as a robust fishing line for maritime deployments."
-	icon_state = "line"
+	icon_state = "line_brute"
 	force = 0
 	throwforce = 1
 	w_class = SIZE_SMALL
@@ -253,10 +253,7 @@
 	name = "Synth-Graft"
 	desc = "An applicator for synthetic skin field grafts. The stuff reeks, itches like the dickens, hurts going on, and the color is \
 		a perfectly averaged multiethnic tone that doesn't blend with <i>anyone's</i> complexion. But at least you don't have to stay in sickbay."
-	/// Placeholder.
-	icon_state = "line"
-	/// Placeholder, to distinguish from surgical line.
-	color = "yellow"
+	icon_state = "line_burn"
 	force = 0
 	throwforce = 1
 	w_class = SIZE_SMALL

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -251,8 +251,80 @@
 	name = "blue barrel"
 	desc = "A blue storage barrel."
 	icon_state = "barrel_blue"
+	var/strap_overlay = "+straps"
 	parts_type = /obj/item/stack/sheet/metal
 	unpacking_sound = 'sound/effects/metalhit.ogg'
+	var/straps = FALSE
+
+/obj/structure/largecrate/random/barrel/true_random
+	name = "barrel"
+	desc = "A barrel."
+	icon_state = "barrel_recolorable"
+	desc_lore = "From the future."
+	var/cap_doodad_state = ""
+	var/center_doodad_state = ""
+	var/color_override = null
+
+
+GLOBAL_LIST_EMPTY(rbarrel_cap_states) // Will be set up in generate_barrel_states
+GLOBAL_LIST_INIT(rbarrel_center_states, generate_barrel_states())
+GLOBAL_LIST_INIT(rbarrel_color_list, list(COLOUR_SILVER,
+	COLOUR_FLOORTILE_GRAY,
+	COLOUR_MAROON,
+	COLOUR_SOFT_RED,
+	COLOUR_LIGHT_GRAYISH_RED,
+	COLOUR_VERY_SOFT_YELLOW,
+	COLOUR_OLIVE,
+	COLOUR_DARK_MODERATE_LIME_GREEN,
+	COLOUR_TEAL,
+	COLOUR_MODERATE_BLUE,
+	COLOUR_PURPLE,
+	COLOUR_STRONG_VIOLET,
+	COLOUR_BEIGE,
+	COLOUR_DARK_MODERATE_ORANGE,
+	COLOUR_BROWN,
+	COLOUR_DARK_BROWN))
+
+/proc/generate_barrel_states()
+	var/list/rbarrel_center_states = list()
+	var/icon/icon = new('icons/obj/structures/crates.dmi')
+	var/list/icon_list = icon_states(icon)
+	for(var/state in icon_list)
+		if(findtext(state,"+cap"))
+			GLOB.rbarrel_cap_states.Add(state)
+		if(findtext(state,"+center"))
+			rbarrel_center_states.Add(state)
+	// We are returning rbarrel_center_states (rather than setting GLOB) because we are called by the global initializer to set it
+	return rbarrel_center_states
+
+/obj/structure/largecrate/random/barrel/true_random/Initialize()
+	. = ..()
+
+	var/image/center_coloring = image(icon, src,"+_center")
+
+	if(!color_override)
+		center_coloring.color = pick(GLOB.rbarrel_color_list)
+
+	center_coloring.appearance_flags = RESET_COLOR|KEEP_APART
+	overlays += center_coloring
+	if(prob(25))
+		cap_doodad_state = pick(GLOB.rbarrel_cap_states)
+		overlays += image(icon,src,cap_doodad_state)
+	if(prob(50))
+		center_doodad_state = pick(GLOB.rbarrel_center_states)
+		overlays += image(icon,src,center_doodad_state)
+
+/obj/structure/largecrate/random/barrel/Initialize()
+	. = ..()
+	if(overlays)
+		overlays.Cut()
+	if(straps)
+		overlays += image(icon,icon_state = "+straps")
+
+/obj/structure/largecrate/random/barrel/unpack()
+	if(overlays)
+		overlays.Cut()
+	. = ..()
 
 /obj/structure/largecrate/random/barrel/blue
 	name = "blue barrel"
@@ -263,6 +335,7 @@
 	name = "red barrel"
 	desc = "A red storage barrel."
 	icon_state = "barrel_red"
+	straps = TRUE//the original sprite had straps, anyway, this is a harmless instance
 
 /obj/structure/largecrate/random/barrel/green
 	name = "green barrel"

code/modules/clothing/head/helmet.dm

@@ -234,7 +234,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/reagent_container/food/drinks/flask = "helmet_flask",
 	/obj/item/reagent_container/food/drinks/flask/marine = "helmet_flask",
 	/obj/item/reagent_container/food/snacks/eat_bar = "helmet_snack_eat",
-	/obj/item/reagent_container/food/snacks/packaged_burrito = "helmet_snack_burrito",
 	/obj/item/reagent_container/food/snacks/mushroompizzaslice = "pizza", // Fuck whoever put these under different paths for some REASON
 	/obj/item/reagent_container/food/snacks/vegetablepizzaslice = "pizza",
 	/obj/item/reagent_container/food/snacks/meatpizzaslice = "pizza",