diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_teshari.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_teshari.dmi new file mode 100644 index 00000000000..c21c3e18416 Binary files /dev/null and b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_teshari.dmi differ diff --git a/modular_skyrat/modules/GAGS/nsfw/greyscale_configs.dm b/modular_skyrat/modules/GAGS/nsfw/greyscale_configs.dm index 5a1b186d6e9..267cafeaf0e 100644 --- a/modular_skyrat/modules/GAGS/nsfw/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/nsfw/greyscale_configs.dm @@ -106,6 +106,11 @@ icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform-hoof.dmi' json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/body.json' +/datum/greyscale_config/shibari/worn/teshari + name = "Shibari (Worn, Teshari)" + icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi' + json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/body.json' + //body /datum/greyscale_config/shibari/body @@ -132,6 +137,11 @@ name = "Shibari Body (Worn, Taur Hoof)" json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/body.json' +/datum/greyscale_config/shibari/body/worn/teshari + name = "Shibari Body (Worn, Teshari)" + icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi' + json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/body.json' + //groin /datum/greyscale_config/shibari/groin @@ -158,6 +168,11 @@ name = "Shibari Groin (Worn, Taur Hoof)" json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/groin.json' +/datum/greyscale_config/shibari/groin/worn/teshari + name = "Shibari Groin (Worn, Teshari)" + icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi' + json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/groin.json' + //fullbody /datum/greyscale_config/shibari/fullbody @@ -184,6 +199,11 @@ name = "Shibari Fullbody (Worn, Taur Hoof)" json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/fullbody.json' +/datum/greyscale_config/shibari/fullbody/worn/teshari + name = "Shibari Fullbody (Worn, Teshari)" + icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi' + json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/fullbody.json' + //hands /datum/greyscale_config/shibari/hands @@ -196,6 +216,11 @@ icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves.dmi' json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/hands.json' +/datum/greyscale_config/shibari/hands/worn/teshari + name = "Shibari Hands (Worn, Teshari)" + icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves_teshari.dmi' + json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/hands.json' + //legs /datum/greyscale_config/shibari/legs @@ -213,3 +238,8 @@ icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes_digi.dmi' json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/legs.json' +/datum/greyscale_config/shibari/legs/worn/teshari + name = "Shibari Legs (Worn, Teshari)" + icon_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes_teshari.dmi' + json_config = 'modular_skyrat/modules/GAGS/nsfw/json_configs/clothes/legs.json' + diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index ae704436b5b..f4b01d01163 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -757,6 +757,7 @@ icon_state = "lannese" worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' worn_icon_digi = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi' + worn_icon_teshari = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_teshari.dmi' supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION inhand_icon_state = "firefighter" can_adjust = TRUE @@ -768,6 +769,7 @@ icon_state = "lannese_vambrace" worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' worn_icon_digi = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi' + worn_icon_teshari = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_teshari.dmi' body_parts_covered = CHEST|GROIN|LEGS|ARMS|FEET // Donation reward for Hacker T.Dog diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm index ed9b8ea4234..2fe063874b3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm @@ -8,6 +8,7 @@ worn_icon_taur_snake = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform-snake.dmi' worn_icon_taur_paw = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform-paw.dmi' worn_icon_taur_hoof = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform-hoof.dmi' + worn_icon_teshari = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi' inhand_icon_state = "latex_catsuit" lefthand_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_left.dmi' righthand_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_right.dmi' diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm index 3de778f7da6..87af00b60e2 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm @@ -4,6 +4,7 @@ icon_state = "shibari_arms" icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_gloves.dmi' worn_icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves.dmi' + worn_icon_teshari = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves_teshari.dmi' body_parts_covered = NONE //strip_delay = 100 breakouttime = 5 SECONDS @@ -11,6 +12,7 @@ greyscale_config = /datum/greyscale_config/shibari/hands greyscale_config_worn = /datum/greyscale_config/shibari/hands/worn + greyscale_config_worn_teshari = /datum/greyscale_config/shibari/hands/worn/teshari greyscale_colors = "#bd8fcf" ///should this clothing item use the emissive system diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm index 08c3afb6d27..b8f5cbd2588 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm @@ -5,6 +5,7 @@ icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_shoes.dmi' worn_icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes.dmi' worn_icon_digi = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes_digi.dmi' + worn_icon_teshari = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes_teshari.dmi' body_parts_covered = NONE strip_delay = 100 supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION|STYLE_TAUR_ALL @@ -14,6 +15,7 @@ greyscale_config = /datum/greyscale_config/shibari/legs greyscale_config_worn = /datum/greyscale_config/shibari/legs/worn greyscale_config_worn_digi = /datum/greyscale_config/shibari/legs/worn/digi + greyscale_config_worn_teshari = /datum/greyscale_config/shibari/legs/worn/teshari greyscale_colors = "#bd8fcf" ///should this clothing item use the emissive system diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm index 10091f9651e..52760eceab3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm @@ -122,6 +122,7 @@ greyscale_config_worn_taur_snake = /datum/greyscale_config/shibari/body/worn/taur_snake greyscale_config_worn_taur_paw = /datum/greyscale_config/shibari/body/worn/taur_paw greyscale_config_worn_taur_hoof = /datum/greyscale_config/shibari/body/worn/taur_hoof + greyscale_config_worn_teshari = /datum/greyscale_config/shibari/body/worn/teshari greyscale_colors = "#bd8fcf" //processing stuff @@ -144,6 +145,7 @@ greyscale_config_worn_taur_snake = /datum/greyscale_config/shibari/groin/worn/taur_snake greyscale_config_worn_taur_paw = /datum/greyscale_config/shibari/groin/worn/taur_paw greyscale_config_worn_taur_hoof = /datum/greyscale_config/shibari/groin/worn/taur_hoof + greyscale_config_worn_teshari = /datum/greyscale_config/shibari/groin/worn/teshari greyscale_colors = "#bd8fcf" //stuff to apply processing on equip and add mood event for perverts @@ -176,6 +178,7 @@ greyscale_config_worn_taur_snake = /datum/greyscale_config/shibari/fullbody/worn/taur_snake greyscale_config_worn_taur_paw = /datum/greyscale_config/shibari/fullbody/worn/taur_paw greyscale_config_worn_taur_hoof = /datum/greyscale_config/shibari/fullbody/worn/taur_hoof + greyscale_config_worn_teshari = /datum/greyscale_config/shibari/fullbody/worn/teshari greyscale_colors = "#bd8fcf#bd8fcf" //processing stuff diff --git a/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves_teshari.dmi b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves_teshari.dmi new file mode 100644 index 00000000000..60a9a5f06d2 Binary files /dev/null and b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves_teshari.dmi differ diff --git a/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes_teshari.dmi b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes_teshari.dmi new file mode 100644 index 00000000000..69ec9f16db1 Binary files /dev/null and b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_shoes_teshari.dmi differ diff --git a/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi index f41dd459b5a..43df1dc105b 100644 Binary files a/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi and b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform_teshari.dmi differ diff --git a/modular_zubbers/code/modules/clothing/neck/cloaks.dm b/modular_zubbers/code/modules/clothing/neck/cloaks.dm index e5679234e19..d83384ef913 100644 --- a/modular_zubbers/code/modules/clothing/neck/cloaks.dm +++ b/modular_zubbers/code/modules/clothing/neck/cloaks.dm @@ -3,4 +3,5 @@ desc = "It's a sad piece of clothing where one finds many graves." icon = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi' icon_state = "binarycloak" diff --git a/modular_zubbers/code/modules/clothing/suits/nerd.dm b/modular_zubbers/code/modules/clothing/suits/nerd.dm index 346b14fead0..a55cebf4989 100644 --- a/modular_zubbers/code/modules/clothing/suits/nerd.dm +++ b/modular_zubbers/code/modules/clothing/suits/nerd.dm @@ -12,6 +12,7 @@ icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi' worn_icon_digi = 'modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' icon_state = "nerd" blood_overlay_type = "suit" diff --git a/modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi b/modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi new file mode 100644 index 00000000000..0ba41783ea4 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi b/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi index c7495d0b94b..931b7af4543 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi new file mode 100644 index 00000000000..24e3325ec6a Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi differ