meows loud as hell and purrs and shit

DopplerShift13 · Aug 29, 2024 · 19259a8 · 19259a8
1 parent 0851b7b
commit 19259a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm
@@ -57,7 +57,7 @@
 	if(!json_config)
 		stack_trace("Greyscale config object [DebugName()] is missing a json configuration, make sure `json_config` has been assigned a value.")
 	string_json_config = "[json_config]"
-	if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1)
+	if(!(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1 || findtext(string_json_config, "modular_np_lethal/lethal_GAGS/json_configs") != 1)) //DOPPLER EDIT originally if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1)
 		stack_trace("All greyscale json configuration files should be located within 'code/datums/greyscale/json_configs/'")
 	if(!icon_file)
 		stack_trace("Greyscale config object [DebugName()] is missing an icon file, make sure `icon_file` has been assigned a value.")

diff --git a/modular_doppler/modular_cosmetics/code/neck/collar.dm b/modular_doppler/modular_cosmetics/code/neck/collar.dm
@@ -94,7 +94,7 @@
 	icon_state = "bell"
 	greyscale_config = /datum/greyscale_config/collar/bell
 	greyscale_config_worn = /datum/greyscale_config/collar/bell/worn
-	greyscale_colors = "#663300#FFCC00"
+	greyscale_colors = "##222222#C0C0C0"
 
 /obj/item/clothing/neck/human_petcollar/locked/choker
 	name = "choker"