Merge pull request #11697 from Ghommie/Ghommie-cit655

Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
parent 6cd1d195ad 42b2881f10
commit d60932ca5d
127 changed files with 586 additions and 1055 deletions
@@ -149,7 +149,7 @@ Code:
 	name = "shock collar"
 	desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.."
 	icon = 'modular_citadel/icons/obj/clothing/cit_neck.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/neck.dmi'
+	mob_overlay_icon = 'modular_citadel/icons/mob/citadel/neck.dmi'
 	icon_state = "shockcollar"
 	item_state = "shockcollar"
 	body_parts_covered = NECK