From 51721a4ed3f424d3e43a40bc6281a97d4bcab19a Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:43:52 +0200
Subject: [PATCH] [MIRROR] Fixes Cayenne's error sign flickering (#6290)

* Fixes Cayenne's error sign flickering (#59614)

This PR fixes a case where Cayenne's sprite was flickering an error sign when carrying a disk and correctly assigns icon state names to JSON gags files for carp mouth and wirecutters as per newest standards to prevent further issues with them in the future.

* Fixes Cayenne's error sign flickering

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
---
 code/datums/greyscale/json_configs/carp_disk_mouth.json | 2 +-
 code/datums/greyscale/json_configs/wirecutters.json     | 2 +-
 code/modules/mob/living/simple_animal/hostile/carp.dm   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/datums/greyscale/json_configs/carp_disk_mouth.json b/code/datums/greyscale/json_configs/carp_disk_mouth.json
index 1068e83cd41..f74fcfdeec6 100644
--- a/code/datums/greyscale/json_configs/carp_disk_mouth.json
+++ b/code/datums/greyscale/json_configs/carp_disk_mouth.json
@@ -1,5 +1,5 @@
 {
-	"": [
+	"disk_mouth": [
 		{
 			"type": "icon_state",
 			"icon_state": "disk_mouth",
diff --git a/code/datums/greyscale/json_configs/wirecutters.json b/code/datums/greyscale/json_configs/wirecutters.json
index 3e08c430b9f..0fb5c530eb5 100644
--- a/code/datums/greyscale/json_configs/wirecutters.json
+++ b/code/datums/greyscale/json_configs/wirecutters.json
@@ -1,5 +1,5 @@
 {
-	"": [
+	"cutters_map": [
 		{
 			"type": "icon_state",
 			"icon_state": "cutters",
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index c88c2a6b243..0002bb73feb 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -235,7 +235,7 @@
 /mob/living/simple_animal/hostile/carp/cayenne/Initialize()
 	. = ..()
 	AddElement(/datum/element/pet_bonus, "bloops happily!")
-	colored_disk_mouth = mutable_appearance(SSgreyscale.GetColoredIconByType(/datum/greyscale_config/carp/disk_mouth, greyscale_colors))
+	colored_disk_mouth = mutable_appearance(SSgreyscale.GetColoredIconByType(/datum/greyscale_config/carp/disk_mouth, greyscale_colors), "disk_mouth")
 	ADD_TRAIT(src, TRAIT_DISK_VERIFIER, INNATE_TRAIT) //carp can verify disky
 	ADD_TRAIT(src, TRAIT_ADVANCEDTOOLUSER, INNATE_TRAIT) //carp SMART