diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index cbf32bb5f02..23b611ff0d3 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -333,6 +333,15 @@ name = "Choker (Worn)" json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/choker_worn.json' +// Thin Choker +/datum/greyscale_config/collar/thinchoker + name = "Thin Choker" + json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json' + +/datum/greyscale_config/collar/thinchoker/worn + name = "Thin Choker (Worn)" + json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json' + // Cow /datum/greyscale_config/collar/cow name = "Cowbell Collar" diff --git a/modular_skyrat/modules/GAGS/icons/collar.dmi b/modular_skyrat/modules/GAGS/icons/collar.dmi index 2b1eb110335..011280e8164 100644 Binary files a/modular_skyrat/modules/GAGS/icons/collar.dmi and b/modular_skyrat/modules/GAGS/icons/collar.dmi differ diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json new file mode 100644 index 00000000000..9e7776e7813 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json @@ -0,0 +1,10 @@ +{ + "thinchoker": [ + { + "type": "icon_state", + "icon_state": "thinchoker_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json new file mode 100644 index 00000000000..ef774087496 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json @@ -0,0 +1,10 @@ +{ + "thinchoker": [ + { + "type": "icon_state", + "icon_state": "thinchoker_mob", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm index e18fdf60427..21d514c2bc7 100644 --- a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm +++ b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm @@ -52,6 +52,14 @@ greyscale_config_worn = /datum/greyscale_config/collar/choker/worn greyscale_colors = "#222222" +/obj/item/clothing/neck/human_petcollar/thinchoker + name = "thin choker" + desc = "Like the normal one, but thinner!" + icon_state = "thinchoker" + greyscale_config = /datum/greyscale_config/collar/thinchoker + greyscale_config_worn = /datum/greyscale_config/collar/thinchoker/worn + greyscale_colors = "#222222" + /obj/item/key/collar name = "collar key" desc = "A key for a tiny lock on a collar or bag." diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm index bff0df5dec9..9af8adabbbe 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm @@ -127,6 +127,10 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck) name = "Choker" item_path = /obj/item/clothing/neck/human_petcollar/choker +/datum/loadout_item/neck/thinchoker + name = "Thin Choker" + item_path = /obj/item/clothing/neck/human_petcollar/thinchoker + /datum/loadout_item/neck/collar name = "Collar" item_path = /obj/item/clothing/neck/human_petcollar diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm index 0a44b8e3b6c..59241ed4dc1 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm @@ -58,6 +58,7 @@ /obj/item/clothing/neck/kink_collar = 8, /obj/item/clothing/neck/human_petcollar = 8, /obj/item/clothing/neck/human_petcollar/choker = 8, + /obj/item/clothing/neck/human_petcollar/thinchoker = 8, /obj/item/clothing/neck/human_petcollar/locked/cow = 8, /obj/item/clothing/neck/human_petcollar/locked/bell = 8, /obj/item/clothing/neck/human_petcollar/locked/cross = 8,