Merge pull request #71 from KnigTheThrasher/collarz

Blacklists certain neck items from chameleon gear
IrisSS13 · Sep 18, 2024 · 23ab40f · 23ab40f
2 parents e4b4c63 + 0ef3c7a
commit 23ab40f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 2 deletions.
diff --git a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm
@@ -5,8 +5,10 @@
 
 /datum/action/item_action/chameleon/change/neck/initialize_blacklist()
 	. = ..()
-	chameleon_blacklist |= typecacheof(/obj/item/clothing/neck/cloak/skill_reward)
-
+	chameleon_blacklist |= typecacheof(list(/obj/item/clothing/neck/cloak/skill_reward,
+		/obj/item/clothing/neck/human_petcollar,
+		/obj/item/clothing/neck/petcollar))
+//IRIS EDIT
 /datum/action/item_action/chameleon/change/stamp
 	chameleon_type = /obj/item/stamp
 	chameleon_name = "Stamp"

diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/genitals/breasts_onmob.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/genitals/breasts_onmob.dmi
diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/genitals/penis_onmob.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/genitals/penis_onmob.dmi
diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/genitals/taur_penis_onmob.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/genitals/taur_penis_onmob.dmi
diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/genitals/taur_testicles_onmob.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/genitals/taur_testicles_onmob.dmi
diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi
diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/genitals/vagina_onmob.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/genitals/vagina_onmob.dmi