Icon conflicts

Fluffy-Frontier · Feb 1, 2025 · 8a3c46c · 8a3c46c
1 parent 0ed6ee4
commit 8a3c46c
Show file tree

Hide file tree

Showing 33 changed files with 29 additions and 115 deletions.
diff --git a/tff_modular/modules/deadspace/code/necromorph/bodyparts/bodyparts.dm b/tff_modular/modules/deadspace/code/necromorph/bodyparts/bodyparts.dm
@@ -8,10 +8,8 @@
 	bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
 	limb_id = SPECIES_NECROMORPH
 	should_draw_greyscale = FALSE
-	//bodypart_flags = ()
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
-	icon_state = "chest"
+	icon_state = "necromorph_chest"
 	interaction_flags_item = NONE //So you don't pick it up
 	w_class = WEIGHT_CLASS_GIGANTIC //So you can't put them in bags
 	dmg_overlay_type = null
@@ -30,9 +28,8 @@
 	bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
 	limb_id = SPECIES_NECROMORPH
 	should_draw_greyscale = FALSE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
-	icon_state = "head"
+	icon_state = "necromorph_head"
 	interaction_flags_item = NONE
 	w_class = WEIGHT_CLASS_GIGANTIC
 	head_flags = null
@@ -64,9 +61,8 @@
 	bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
 	limb_id = SPECIES_NECROMORPH
 	should_draw_greyscale = FALSE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
-	icon_state = "l_arm"
+	icon_state = "necromorph_l_arm"
 	interaction_flags_item = NONE
 	w_class = WEIGHT_CLASS_GIGANTIC
 	dmg_overlay_type = null
@@ -97,9 +93,8 @@
 	bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
 	limb_id = SPECIES_NECROMORPH
 	should_draw_greyscale = FALSE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
-	icon_state = "r_arm"
+	icon_state = "necromorph_r_arm"
 	interaction_flags_item = NONE
 	w_class = WEIGHT_CLASS_GIGANTIC
 	dmg_overlay_type = null
@@ -130,9 +125,8 @@
 	bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
 	limb_id = SPECIES_NECROMORPH
 	should_draw_greyscale = FALSE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
-	icon_state = "l_leg"
+	icon_state = "necromorph_l_leg"
 	interaction_flags_item = NONE
 	w_class = WEIGHT_CLASS_GIGANTIC
 	dmg_overlay_type = null
@@ -163,9 +157,8 @@
 	bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
 	limb_id = SPECIES_NECROMORPH
 	should_draw_greyscale = FALSE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/base_necromorph.dmi'
-	icon_state = "r_leg"
+	icon_state = "necromorph_r_leg"
 	interaction_flags_item = NONE
 	w_class = WEIGHT_CLASS_GIGANTIC
 	dmg_overlay_type = null

diff --git a/tff_modular/modules/deadspace/code/necromorph/bodyparts/brute.dm b/tff_modular/modules/deadspace/code/necromorph/bodyparts/brute.dm
@@ -1,9 +1,8 @@
 /obj/item/bodypart/chest/necromorph/brute
 	name = BODY_ZONE_CHEST
 	limb_id = SPECIES_NECROMORPH_BRUTE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
-	icon_state = "chest-d"
+	icon_state = "chest"
 	max_damage = 400
 	px_x = 0
 	px_y = 0
@@ -14,9 +13,8 @@
 /obj/item/bodypart/head/necromorph/brute
 	name = BODY_ZONE_HEAD
 	limb_id = SPECIES_NECROMORPH_BRUTE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
-	icon_state = "head-d"
+	icon_state = "head"
 	max_damage = 100
 	px_x = 0
 	px_y = -8
@@ -27,9 +25,8 @@
 /obj/item/bodypart/arm/left/necromorph/brute
 	name = "left arm"
 	limb_id = SPECIES_NECROMORPH_BRUTE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
-	icon_state = "l_arm-d"
+	icon_state = "l_arm"
 	attack_verb_continuous = list("slashes", "stabs")
 	attack_verb_simple = list("slash", "stab")
 	max_damage = 150
@@ -42,9 +39,8 @@
 /obj/item/bodypart/arm/right/necromorph/brute
 	name = "right arm"
 	limb_id = SPECIES_NECROMORPH_BRUTE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
-	icon_state = "r_arm-d"
+	icon_state = "r_arm"
 	attack_verb_continuous = list("slashes", "stabs")
 	attack_verb_simple = list("slash", "stab")
 	max_damage = 150
@@ -57,9 +53,8 @@
 /obj/item/bodypart/leg/left/necromorph/brute
 	name = "left leg"
 	limb_id = SPECIES_NECROMORPH_BRUTE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
-	icon_state = "l_leg-d"
+	icon_state = "l_leg"
 	attack_verb_continuous = list("kicks", "stomps")
 	attack_verb_simple = list("kick", "stomp")
 	max_damage = 150
@@ -80,9 +75,8 @@
 /obj/item/bodypart/leg/right/necromorph/brute
 	name = "right leg"
 	limb_id = SPECIES_NECROMORPH_BRUTE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/brute.dmi'
-	icon_state = "r_leg-d"
+	icon_state = "r_leg"
 	attack_verb_continuous = list("kicks", "stomps")
 	attack_verb_simple = list("kick", "stomp")
 	max_damage = 150

diff --git a/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_exploder.dm b/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_exploder.dm
@@ -12,7 +12,6 @@
 /obj/item/bodypart/head/necromorph/exploder/enhanced
 	name = BODY_ZONE_HEAD
 	limb_id = SPECIES_NECROMORPH_EXPLODER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_state = "head"
 	max_damage = 35
@@ -24,7 +23,6 @@
 /obj/item/bodypart/arm/left/necromorph/exploder/enhanced
 	name = "red pustule"
 	limb_id = SPECIES_NECROMORPH_EXPLODER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_state = "l_arm"
 	attack_verb_continuous = list("kicks", "stomps")
@@ -38,7 +36,6 @@
 /obj/item/bodypart/arm/right/necromorph/exploder/enhanced
 	name = "right arm"
 	limb_id = SPECIES_NECROMORPH_EXPLODER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_state = "r_arm"
 	attack_verb_continuous = list("kicks", "stomps")
@@ -52,7 +49,6 @@
 /obj/item/bodypart/leg/right/necromorph/exploder/enhanced
 	name = "fused legs"
 	desc = "Two legs fused together to form a thick, meaty stalk."
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_state = "r_leg"
 	plaintext_zone = "fused legs"
@@ -72,7 +68,6 @@
 /obj/item/bodypart/leg/left/necromorph/exploder/enhanced
 	name = "nub"
 	desc = "The fleshy remains of a leg that was fused together. This is useless."
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder_enhanced.dmi'
 	icon_state = "l_leg"
 	plaintext_zone = "leg nub"

diff --git a/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_infector.dm b/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_infector.dm
@@ -1,7 +1,6 @@
 /obj/item/bodypart/chest/necromorph/infector/enhanced
 	name = BODY_ZONE_CHEST
 	limb_id = SPECIES_NECROMORPH_INFECTOR_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_state = "chest"
 	max_damage = 200
@@ -12,7 +11,6 @@
 /obj/item/bodypart/head/necromorph/infector/enhanced
 	name = BODY_ZONE_HEAD
 	limb_id = SPECIES_NECROMORPH_INFECTOR_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_state = "head"
 	max_damage = 200
@@ -23,7 +21,6 @@
 /obj/item/bodypart/arm/left/necromorph/infector/enhanced
 	name = "left arm"
 	limb_id = SPECIES_NECROMORPH_INFECTOR_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_state = "l_arm"
 	attack_verb_continuous = list("slashes", "stabs")
@@ -36,7 +33,6 @@
 /obj/item/bodypart/arm/right/necromorph/infector/enhanced
 	name = "right arm"
 	limb_id = SPECIES_NECROMORPH_INFECTOR_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_state = "l_arm"
 	attack_verb_continuous = list("slashes", "stabs")
@@ -49,7 +45,6 @@
 /obj/item/bodypart/leg/left/necromorph/infector/enhanced
 	name = "left leg"
 	limb_id = SPECIES_NECROMORPH_INFECTOR_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_state = "l_leg"
 	attack_verb_continuous = list("kicks", "stomps")
@@ -62,7 +57,6 @@
 /obj/item/bodypart/leg/right/necromorph/infector/enhanced
 	name = "right leg"
 	limb_id = SPECIES_NECROMORPH_INFECTOR_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/infector_enhanced.dmi'
 	icon_state = "r_leg"
 	attack_verb_continuous = list("kicks", "stomps")

diff --git a/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_leaper.dm b/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_leaper.dm
@@ -1,7 +1,6 @@
 /obj/item/bodypart/chest/necromorph/leaper/enhanced
 	name = BODY_ZONE_CHEST
 	limb_id = SPECIES_NECROMORPH_LEAPER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_state = "chest"
 	max_damage = 200
@@ -11,7 +10,6 @@
 /obj/item/bodypart/head/necromorph/leaper/enhanced
 	name = BODY_ZONE_HEAD
 	limb_id = SPECIES_NECROMORPH_LEAPER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_state = "head"
 	max_damage = 45
@@ -21,7 +19,6 @@
 //Leapers use arms to walk
 /obj/item/bodypart/arm/left/necromorph/leaper/enhanced
 	limb_id = SPECIES_NECROMORPH_LEAPER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_state = "l_arm"
 	attack_verb_continuous = list("kicks", "stomps")
@@ -32,7 +29,6 @@
 
 /obj/item/bodypart/arm/right/necromorph/leaper/enhanced
 	limb_id = SPECIES_NECROMORPH_LEAPER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_state = "r_arm"
 	attack_verb_continuous = list("kicks", "stomps")
@@ -44,7 +40,6 @@
 /obj/item/bodypart/leg/right/necromorph/leaper/enhanced
 	desc = "A long calloused string of flesh held securely together with tendons and exposed bone, it looks very sharp at the tip."
 	limb_id = SPECIES_NECROMORPH_LEAPER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_state = "r_leg"
 	max_damage = 40
@@ -56,7 +51,6 @@
 /obj/item/bodypart/leg/left/necromorph/leaper/enhanced
 	desc = "A long calloused string of flesh held securely together with tendons and exposed bone, it looks very sharp at the tip."
 	limb_id = SPECIES_NECROMORPH_LEAPER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/leaper_enhanced.dmi'
 	icon_state = "l_leg"
 	max_damage = 40

diff --git a/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_slasher.dm b/tff_modular/modules/deadspace/code/necromorph/bodyparts/e_slasher.dm
@@ -1,7 +1,6 @@
 /obj/item/bodypart/chest/necromorph/slasher/enhanced
 	name = BODY_ZONE_CHEST
 	limb_id = SPECIES_NECROMORPH_SLASHER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_state = "chest"
 	max_damage = 300
@@ -13,7 +12,6 @@
 /obj/item/bodypart/head/necromorph/slasher/enhanced
 	name = BODY_ZONE_HEAD
 	limb_id = SPECIES_NECROMORPH_SLASHER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_state = "head"
 	max_damage = 200
@@ -25,7 +23,6 @@
 /obj/item/bodypart/arm/left/necromorph/slasher/enhanced
 	name = "left blade"
 	limb_id = SPECIES_NECROMORPH_SLASHER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_state = "l_arm"
 	attack_verb_continuous = list("slashes", "stabs")
@@ -39,7 +36,6 @@
 /obj/item/bodypart/arm/right/necromorph/slasher/enhanced
 	name = "right blade"
 	limb_id = SPECIES_NECROMORPH_SLASHER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_state = "r_arm"
 	attack_verb_continuous = list("slashes", "stabs")
@@ -53,7 +49,6 @@
 /obj/item/bodypart/leg/left/necromorph/slasher/enhanced
 	name = "left leg"
 	limb_id = SPECIES_NECROMORPH_SLASHER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_state = "l_leg"
 	attack_verb_continuous = list("kicks", "stomps")
@@ -67,7 +62,6 @@
 /obj/item/bodypart/leg/right/necromorph/slasher/enhanced
 	name = "right leg"
 	limb_id = SPECIES_NECROMORPH_SLASHER_ENHANCED
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/slasher_enhanced.dmi'
 	icon_state = "r_leg"
 	attack_verb_continuous = list("kicks", "stomps")

diff --git a/tff_modular/modules/deadspace/code/necromorph/bodyparts/exploder.dm b/tff_modular/modules/deadspace/code/necromorph/bodyparts/exploder.dm
@@ -1,7 +1,6 @@
 /obj/item/bodypart/chest/necromorph/exploder
 	name = BODY_ZONE_CHEST
 	limb_id = SPECIES_NECROMORPH_EXPLODER
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_state = "chest"
 	max_damage = 200
@@ -13,7 +12,6 @@
 /obj/item/bodypart/head/necromorph/exploder
 	name = BODY_ZONE_HEAD
 	limb_id = SPECIES_NECROMORPH_EXPLODER
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_state = "head"
 	max_damage = 25
@@ -27,7 +25,6 @@
 /obj/item/bodypart/arm/left/necromorph/exploder
 	name = "yellow pustule"
 	limb_id = SPECIES_NECROMORPH_EXPLODER
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_state = "l_arm"
 	interaction_flags_item = INTERACT_ITEM_ATTACK_HAND_PICKUP //We want to be able to pick up and throw the pustle
@@ -71,7 +68,6 @@
 /obj/item/bodypart/arm/right/necromorph/exploder
 	name = "right arm"
 	limb_id = SPECIES_NECROMORPH_EXPLODER
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_state = "r_arm"
 	attack_verb_continuous = list("kicks", "stomps")
@@ -88,8 +84,7 @@
 	plaintext_zone = "fused legs"
 	limb_id = SPECIES_NECROMORPH_EXPLODER
 	can_be_disabled = TRUE //We do however, want humans to be able to immobilize the exploder
-	disabling_threshold_percentage = 2 //CHANGE BACK TO 1?
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
+	disabling_threshold_percentage = 2
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi' //Since the leg is part of the chest sprite, we don't want a sprite ontop of the sprite
 	icon_state = "r_leg"
 	max_damage = 40 //Bit stronger due to it being two limbs fused together
@@ -119,7 +114,6 @@
 	limb_id = SPECIES_NECROMORPH_EXPLODER
 	bodypart_flags = BODYPART_PSEUDOPART //This will prevent the limb from having standard functions
 	can_be_disabled = FALSE
-	icon = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_static = 'tff_modular/modules/deadspace/icons/necromorphs/exploder/exploder.dmi'
 	icon_state = "l_leg"
 	max_damage = 20