Fixes Various Icon Bugs (#6049)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Creates Cultist Clothing Sheet.**
2. **Creates Heretic Clothing Sheet.**
3. **Removes Extraneous Sprites.**
4. **Maps In Updated Memorial.**
5. **Fixes Foam Spears.**
6. **Fixes Worm Recipe Path.**

## Why It's Good For The Game

1. _Shifts cult armor icon mapping to the new standard._
2. _Shifts heretic robe icon mapping to the new standard._
3. _Removes duplicates of cult and heretic sprites from old icon
sheets._
4. _The memorial was updated to be one object or something and whoever
made it forgot to map it in for Atlas CentCom._
5. _Foam spears weren't using the correct icons._
6. _Worms were slightly repathed, breaking a few goblin recipes.
Corrects this._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: Shifts cult armor to new sheet.
tweak: Shifts heretic robes to new sheet.
del: Removes duplicate icons of the above from old sheets.
fix: Remaps new memorial on Atlas.
fix: Fixes spear icon state issue.
fix: Fixes worm pathing in recipes.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

code/game/gamemodes/cult/cult_items.dm

@@ -52,8 +52,9 @@
 	if(istype(user, /mob/living/simple_mob/construct))
 		to_chat(user, "<span class='warning'>\The [src] hisses, as it is discontent with your acquisition of it. It would be wise to return it to a worthy mortal quickly.</span>")
 
-/obj/item/clothing/head/culthood
+/obj/item/clothing/head/cult
 	name = "cult hood"
+	icon = 'icons/clothing/suit/antag/cult.dmi'
 	icon_state = "culthood"
 	desc = "A hood worn by the followers of Nar-Sie."
 	origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1)
@@ -63,58 +64,70 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
-/obj/item/clothing/head/culthood/cultify()
+/obj/item/clothing/head/cult/cultify()
 	return
 
-/obj/item/clothing/head/culthood/magus
+/obj/item/clothing/head/cult/magus
 	name = "magus helm"
 	icon_state = "magus"
 	desc = "A helm worn by the followers of Nar-Sie."
 	inv_hide_flags = HIDEFACE | BLOCKHAIR
 	body_cover_flags = HEAD|FACE|EYES
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
-/obj/item/clothing/head/culthood/alt
-	icon_state = "cult_hoodalt"
+/obj/item/clothing/head/cult/alt
+	icon_state = "culthoodalt"
 
 /obj/item/clothing/suit/cultrobes
 	name = "cult robes"
 	desc = "A set of armored robes worn by the followers of Nar-Sie."
+	icon = 'icons/clothing/suit/antag/cult.dmi'
 	icon_state = "cultrobes"
 	origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1)
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/book/tome,/obj/item/melee/cultblade)
 	armor_type = /datum/armor/cult/robes
 	inv_hide_flags = HIDEJUMPSUIT
 	siemens_coefficient = 0
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/suit/cultrobes/cultify()
 	return
 
 /obj/item/clothing/suit/cultrobes/alt
 	icon_state = "cultrobesalt"
 
-/obj/item/clothing/suit/cultrobes/magusred
+/obj/item/clothing/suit/cultrobes/magus
 	name = "magus robes"
 	desc = "A set of armored robes worn by the followers of Nar-Sie."
+	icon = 'icons/clothing/suit/antag/cult.dmi'
 	icon_state = "magusred"
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
+/obj/item/clothing/suit/cultrobes/magus/blue
+	icon_state = "magusblue"
 
 /obj/item/clothing/head/helmet/space/cult
 	name = "cult helmet"
 	desc = "A space worthy helmet used by the followers of Nar-Sie."
-	icon_state = "cult_helmet"
+	icon = 'icons/clothing/suit/armor/cult.dmi'
+	icon_state = "culthelm"
 	origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1)
 	armor_type = /datum/armor/cult/space
 	siemens_coefficient = 0
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/head/helmet/space/cult/cultify()
 	return
 
 /obj/item/clothing/suit/space/cult
 	name = "cult armour"
-	icon_state = "cult_armour"
+	icon = 'icons/clothing/suit/armor/cult.dmi'
+	icon_state = "cult"
 	origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1)
 	desc = "A bulky suit of armour, bristling with spikes. It looks space-worthy."
 	w_class = ITEMSIZE_NORMAL
@@ -124,6 +137,7 @@
 	siemens_coefficient = 0
 	inv_hide_flags = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/suit/space/cult/cultify()
 	return

code/game/gamemodes/cult/runes.dm

@@ -1101,7 +1101,7 @@ var/list/sacrificed = list()
 	usr.visible_message("<span class='warning'>The rune disappears with a flash of red light, and a set of armor appears on [usr]...</span>", \
 	"<span class='warning'>You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.</span>")
 
-	user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), SLOT_ID_HEAD)
+	user.equip_to_slot_or_del(new /obj/item/clothing/head/cult/alt(user), SLOT_ID_HEAD)
 	user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), SLOT_ID_SUIT)
 	user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), SLOT_ID_SHOES)
 	user.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), SLOT_ID_BACK)

code/game/objects/items/weapons/material/foam.dm

@@ -29,7 +29,7 @@
 	force_divisor = 1
 	damage_force = 0
 	applies_material_colour = 1
-	base_icon = "spear_mask0"
+	base_icon = "spear_mask"
 	icon_state = "spear_mask0"
 	unbreakable = 1
 	drop_sound = 'sound/items/drop/device.ogg'
@@ -45,7 +45,7 @@
 	force_divisor = 1
 	damage_force = 0
 	applies_material_colour = 1
-	base_icon = "fireaxe_mask0"
+	base_icon = "fireaxe_mask"
 	icon_state = "fireaxe_mask0"
 	unbreakable = 1
 	sharp = 0

code/game/objects/random/mapping.dm

@@ -392,7 +392,7 @@
 			prob(1);list(
 				/obj/item/melee/cultblade,
 				/obj/item/clothing/suit/cultrobes,
-				/obj/item/clothing/head/culthood,
+				/obj/item/clothing/head/cult,
 				/obj/item/soulstone,
 				/obj/structure/closet/crate
 			),

code/modules/clothing/head/hood.dm

@@ -150,10 +150,12 @@
 /obj/item/clothing/head/hood/eldritch
 	name = "eldritch hood"
 	desc = "A baggy hood smeared with some kind of waxy substance. Up close, what appeared to be burlap is revealed to actually be tanned skin."
-	icon_state = "eldritch"
+	icon = 'icons/clothing/suit/antag/heretic.dmi'
+	icon_state = "eldritchhood"
 	clothing_flags = CLOTHING_THICK_MATERIAL
 	siemens_coefficient = 0.9
 	armor_type = /datum/armor/lavaland/eldritch
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 // Costumes
 /obj/item/clothing/head/hood/carp_hood

code/modules/clothing/suits/hooded.dm

@@ -481,7 +481,8 @@
 /obj/item/clothing/suit/storage/hooded/eldritch
 	name = "eldritch garment"
 	desc = "A billowing garment that seeps a thick, waxy substance. Upon closer inspection this outfit is crafted out of tanned skin, the ritual icons and spells drawn onto it having been tattooed before removal."
-	icon_state = "eldritch_armor"
+	icon = 'icons/clothing/suit/antag/heretic.dmi'
+	icon_state = "eldritcharmor"
 	clothing_flags = CLOTHING_THICK_MATERIAL
 	inv_hide_flags = HIDEHOLSTER
 	item_state_slots = list(SLOT_ID_RIGHT_HAND = "brown_jacket", SLOT_ID_LEFT_HAND = "brown_jacket")
@@ -492,6 +493,7 @@
 	siemens_coefficient = 0.9
 	allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes,
 	/obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/material/knife)
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/suit/storage/hooded/cloak/goliath
 	name = "goliath cloak"

code/modules/food/recipes_microwave.dm

@@ -1388,19 +1388,19 @@ I said no!
 	fruit = list("carrot" = 1, "mushroom" = 1)
 	reagents = list("spacespice" = 2, "water" = 10)
 	items = list(
-		/obj/item/reagent_containers/food/snacks/worm,
-		/obj/item/reagent_containers/food/snacks/worm,
-		/obj/item/reagent_containers/food/snacks/worm
+		/obj/item/reagent_containers/food/snacks/bait/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm
 	)
 	result = /obj/item/reagent_containers/food/snacks/diggerstew
 
 /datum/recipe/diggerstew_pot
 	fruit = list("carrot" = 1, "potato" = 1, "mushroom" = 1)
 	reagents = list("spacespice" = 2, "water" = 10)
 	items = list(
-		/obj/item/reagent_containers/food/snacks/worm,
-		/obj/item/reagent_containers/food/snacks/worm,
-		/obj/item/reagent_containers/food/snacks/worm
+		/obj/item/reagent_containers/food/snacks/bait/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm
 	)
 	result = /obj/item/reagent_containers/food/snacks/diggerstew_pot
 
@@ -1416,7 +1416,7 @@ I said no!
 	reagents = list("spacespice" = 2, "water" = 10)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/meat/grubmeat,
-		/obj/item/reagent_containers/food/snacks/worm
+		/obj/item/reagent_containers/food/snacks/bait/worm
 	)
 	result = /obj/item/reagent_containers/food/snacks/greenham
 
@@ -1426,7 +1426,7 @@ I said no!
 		/obj/item/reagent_containers/food/snacks/egg,
 		/obj/item/reagent_containers/food/snacks/egg,
 		/obj/item/reagent_containers/food/snacks/meat/grubmeat,
-		/obj/item/reagent_containers/food/snacks/worm
+		/obj/item/reagent_containers/food/snacks/bait/worm
 	)
 	result = /obj/item/reagent_containers/food/snacks/greenham
 
@@ -1548,8 +1548,8 @@ I said no!
 /datum/recipe/wormburger
 	items = list(
 		/obj/item/reagent_containers/food/snacks/bun,
-		/obj/item/reagent_containers/food/snacks/worm,
-		/obj/item/reagent_containers/food/snacks/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm,
 		/obj/item/reagent_containers/food/snacks/meat
 	)
 	result = /obj/item/reagent_containers/food/snacks/wormburger
@@ -1571,9 +1571,9 @@ I said no!
 
 /datum/recipe/saplingsdelight
 	items = list(
-		/obj/item/reagent_containers/food/snacks/worm,
-		/obj/item/reagent_containers/food/snacks/worm,
-		/obj/item/reagent_containers/food/snacks/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm,
+		/obj/item/reagent_containers/food/snacks/bait/worm,
 		/obj/item/reagent_containers/food/snacks/badrecipe
 	)
 	result = /obj/item/reagent_containers/food/snacks/saplingsdelight

code/modules/holidays/halloween_loadout_masquarade.dm

@@ -443,63 +443,63 @@
 
 /obj/item/clothing/suit/storage/hooded/fake_cult_hardsuit
 	STD_DEF("plastic suit")
-	icon = 'icons/antagonists/cult/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/cult/on_mob/clothing.dmi'
-	icon_state = "cult_armor"
+	icon = 'icons/clothing/suit/armor/cult.dmi'
+	icon_state = "cult"
 	hoodtype = /obj/item/clothing/head/hood/fake_cult_hardsuit
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/head/hood/fake_cult_hardsuit
 	STD_DEF("hood")
-	icon = 'icons/antagonists/cult/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/cult/on_mob/clothing.dmi'
-	icon_state = "cult_helmet"
+	icon = 'icons/clothing/suit/armor/cult.dmi'
+	icon_state = "culthelm"
 	body_cover_flags = HEAD|EYES
 	clothing_flags = ALLOWINTERNALS
 	cold_protection = HEAD
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /datum/loadout_entry/seasonal/masquarade/cult/robes_new
 	display_name = "Robes (new)"
 	path = /obj/item/clothing/suit/storage/hooded/fake_cult_robes_new
 
 /obj/item/clothing/suit/storage/hooded/fake_cult_robes_new
 	STD_DEF("plastic suit")
-	icon = 'icons/antagonists/cult/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/cult/on_mob/clothing.dmi'
+	icon = 'icons/clothing/suit/antag/cult.dmi'
 	icon_state = "cultrobesalt"
 	hoodtype = /obj/item/clothing/head/hood/fake_cult_robes_new
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/head/hood/fake_cult_robes_new
 	STD_DEF("hood")
-	icon = 'icons/antagonists/cult/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/cult/on_mob/clothing.dmi'
+	icon = 'icons/clothing/suit/antag/cult.dmi'
 	icon_state = "culthoodalt"
 	body_cover_flags = HEAD
 	cold_protection = HEAD
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /datum/loadout_entry/seasonal/masquarade/cult/robes_old
 	display_name = "Robes (old)"
 	path = /obj/item/clothing/suit/storage/hooded/fake_cult_robes_old
 
 /obj/item/clothing/suit/storage/hooded/fake_cult_robes_old
 	STD_DEF("plastic suit")
-	icon = 'icons/antagonists/cult/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/cult/on_mob/clothing.dmi'
+	icon = 'icons/clothing/suit/antag/cult.dmi'
 	icon_state = "cultrobes"
 	hoodtype = /obj/item/clothing/head/hood/fake_cult_robes_old
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/head/hood/fake_cult_robes_old
 	STD_DEF("hood")
-	icon = 'icons/antagonists/cult/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/cult/on_mob/clothing.dmi'
+	icon = 'icons/clothing/suit/antag/cult.dmi'
 	icon_state = "culthood"
 	body_cover_flags = HEAD
 	cold_protection = HEAD
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /datum/loadout_entry/seasonal/masquarade/cult/sword
 	display_name = "Sword"
@@ -518,42 +518,42 @@
 
 /obj/item/clothing/suit/storage/hooded/fake_heretic
 	STD_DEF("cloth robes")
-	icon = 'icons/antagonists/heretic/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/heretic/on_mob/clothing.dmi'
-	icon_state = "eldritch_armor"
+	icon = 'icons/clothing/suit/antag/heretic.dmi'
+	icon_state = "eldritcharmor"
 	hoodtype = /obj/item/clothing/head/hood/fake_heretic
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/head/hood/fake_heretic
 	STD_DEF("hood")
-	icon = 'icons/antagonists/heretic/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/heretic/on_mob/clothing.dmi'
-	icon_state = "eldritch_armor_hood"
+	icon = 'icons/clothing/suit/antag/heretic.dmi'
+	icon_state = "eldritchhood"
 	body_cover_flags = HEAD
 	cold_protection = HEAD
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /datum/loadout_entry/seasonal/masquarade/heretic/void_cloak
 	display_name = "Void Cloak"
 	path = /obj/item/clothing/suit/storage/hooded/fake_void
 
 /obj/item/clothing/suit/storage/hooded/fake_void
 	STD_DEF("cloth cloak")
-	icon = 'icons/antagonists/heretic/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/heretic/on_mob/clothing.dmi'
-	icon_state = "void_cloak"
+	icon = 'icons/clothing/suit/antag/heretic.dmi'
+	icon_state = "voidcloak"
 	hoodtype = /obj/item/clothing/head/hood/fake_void
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /obj/item/clothing/head/hood/fake_void
 	STD_DEF_NON_HIDING("hood")
-	icon = 'icons/antagonists/heretic/items/clothing.dmi'
-	default_worn_icon = 'icons/antagonists/heretic/on_mob/clothing.dmi'
-	icon_state = "void_cloak_hood"
+	icon = 'icons/clothing/suit/antag/heretic.dmi'
+	icon_state = "voidhood"
 	body_cover_flags = HEAD|EYES
 	clothing_flags = ALLOWINTERNALS
 	cold_protection = HEAD
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
 /*
 /datum/loadout_entry/seasonal/masquarade/heretic/living_heart

code/modules/maps/away_missions/archive/labyrinth.dm

@@ -197,7 +197,7 @@
 /obj/spawner/corpse/tunnelclown/sentinel
 	name = "dead clown sentinel"
 	corpsesuit = /obj/item/clothing/suit/cultrobes
-	corpsehelmet = /obj/item/clothing/head/culthood
+	corpsehelmet = /obj/item/clothing/head/cult
 
 /*
 /mob/living/simple_mob/hostile/tunnelclown

code/modules/xenoarcheaology/finds/find_spawning.dm

@@ -244,9 +244,9 @@
 		if(20)
 			//arcane clothing
 			apply_prefix = 0
-			var/list/possible_spawns = list(/obj/item/clothing/head/culthood,
-			/obj/item/clothing/head/culthood/magus,
-			/obj/item/clothing/head/culthood/alt,
+			var/list/possible_spawns = list(/obj/item/clothing/head/cult,
+			/obj/item/clothing/head/cult/magus,
+			/obj/item/clothing/head/cult/alt,
 			/obj/item/clothing/head/helmet/space/cult)
 
 			var/new_type = pick(possible_spawns)