diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi index 988caf48444..9484aaa4ff1 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/neck/neck_teshari.dmi b/modular_skyrat/modules/GAGS/icons/neck/neck_teshari.dmi index 64f35b3f30e..0e83c206fde 100644 Binary files a/modular_skyrat/modules/GAGS/icons/neck/neck_teshari.dmi and b/modular_skyrat/modules/GAGS/icons/neck/neck_teshari.dmi differ diff --git a/modular_zubbers/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/modular_zubbers/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index eddbfb0d36f..5d910dae833 100644 --- a/modular_zubbers/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/modular_zubbers/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -288,3 +288,59 @@ /datum/greyscale_config/overalls/worn/teshari name = "Overalls (Worn, Teshari)" icon_file = 'modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi' + +//GRAYSCALE MAID COSTUME - TESHARI + +/datum/greyscale_config/bubber_maid_neck_cover/worn/teshari + name = "Maid Neck Cover (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi' + +/datum/greyscale_config/bubber_maid_arm_covers/worn/teshari + name = "Maid Arm Covers (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/gloves/gloves_teshari.dmi' + +/datum/greyscale_config/bubber_maid_costume/worn/teshari + name = "Maid Costume (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi' + +/datum/greyscale_config/bubber_maid_headband/worn/teshari + name = "Maid Headband (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi' + +// new maid outfit - teshari + +/datum/greyscale_config/maid/worn/teshari + name = "Maid Uniform (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi' + +/datum/greyscale_config/maid_headband/worn/teshari + name = "Maid Headband (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi' + +/datum/greyscale_config/cloak/boat/worn/teshari + name = "Boatcloak (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi' + +/datum/greyscale_config/cloak/shroud/worn/teshari + name = "Shroud (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi' + +/datum/greyscale_config/cableknit_sweater/worn/teshari + name = "Cableknit Sweater (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/under/skirts_dresses_teshari.dmi' + +/datum/greyscale_config/trek/worn/teshari + name = "Trek Uniform (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi' + +/datum/greyscale_config/primitive_catgirl_boots/worn/digi + name = "Primitive Winter Boots (Worn, Digi)" + icon_file = 'modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi' + +/datum/greyscale_config/primitive_catgirl_boots/worn/teshari + name = "Primitive Winter Boots (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi' + +/datum/greyscale_config/ties/worn/teshari + name = "Ties (Worn, Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi' diff --git a/modular_zubbers/code/modules/GAGS/greyscale_configs.dm b/modular_zubbers/code/modules/GAGS/greyscale_configs.dm index a32596a85b0..e38be1162c2 100644 --- a/modular_zubbers/code/modules/GAGS/greyscale_configs.dm +++ b/modular_zubbers/code/modules/GAGS/greyscale_configs.dm @@ -113,6 +113,10 @@ icon_file = 'modular_zubbers/icons/mob/clothing/under/skirts_dresses.dmi' json_config = 'modular_zubbers/code/datums/greyscale/json_configs/miniskirt_worn.json' +/datum/greyscale_config/miniskirt_worn/teshari + name = "Worn Miniskirt (Teshari)" + icon_file = 'modular_zubbers/icons/mob/clothing/under/skirts_dresses_teshari.dmi' + // SHORT-SLEEVED CROPPED JACKET /datum/greyscale_config/crop_jacket diff --git a/modular_zubbers/code/modules/clothing/accessory/accessory.dm b/modular_zubbers/code/modules/clothing/accessory/accessory.dm index a30d5b62129..e5870520d06 100644 --- a/modular_zubbers/code/modules/clothing/accessory/accessory.dm +++ b/modular_zubbers/code/modules/clothing/accessory/accessory.dm @@ -631,3 +631,9 @@ Potential future ideas: name = "\improper GalFed Official neckpin" desc = "A special golden neckpin to show true loyalty to the Federation." greyscale_colors = "#ffff66#0099ff" + +/obj/item/clothing/accessory/medal/gold/ + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/accessories_teshari.dmi' + +/obj/item/clothing/accessory/medal/gold/captain + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/accessories_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/ears/headset.dm b/modular_zubbers/code/modules/clothing/ears/headset.dm new file mode 100644 index 00000000000..decbdfb591c --- /dev/null +++ b/modular_zubbers/code/modules/clothing/ears/headset.dm @@ -0,0 +1,8 @@ +/obj/item/radio/headset/headset_sec/alt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/ears_teshari.dmi' + +/obj/item/radio/headset/heads/captain/alt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/ears_teshari.dmi' + +/obj/item/radio/headset/heads/hos/alt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/ears_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/glasses/hud.dm b/modular_zubbers/code/modules/clothing/glasses/hud.dm index 709a98614a1..409dd7a5769 100644 --- a/modular_zubbers/code/modules/clothing/glasses/hud.dm +++ b/modular_zubbers/code/modules/clothing/glasses/hud.dm @@ -17,3 +17,12 @@ flags_cover = GLASSESCOVERSEYES tint = 1 custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 0.55, /datum/material/iron = SMALL_MATERIAL_AMOUNT / 2) + +/obj/item/clothing/glasses/hud/security + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/eyes_teshari.dmi' + +/obj/item/clothing/glasses/hud/diagnostic + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/eyes_teshari.dmi' + +/obj/item/clothing/glasses/science + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/eyes_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/gloves/misc.dm b/modular_zubbers/code/modules/clothing/gloves/misc.dm index 215d6ccd81f..6c83dd4dd1d 100644 --- a/modular_zubbers/code/modules/clothing/gloves/misc.dm +++ b/modular_zubbers/code/modules/clothing/gloves/misc.dm @@ -138,3 +138,6 @@ name = "big boss' gloves" desc = "We will forsake our countries." icon_state = "snake" + +/obj/item/clothing/gloves/maid_arm_covers + greyscale_config_worn_teshari = /datum/greyscale_config/bubber_maid_arm_covers/worn/teshari diff --git a/modular_zubbers/code/modules/clothing/head/costume.dm b/modular_zubbers/code/modules/clothing/head/costume.dm index 715f27399e2..2ccfee761cd 100644 --- a/modular_zubbers/code/modules/clothing/head/costume.dm +++ b/modular_zubbers/code/modules/clothing/head/costume.dm @@ -1,2 +1,10 @@ /obj/item/clothing/head/costume/xenos worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi' + +// GAGS old maid headband - teshari +/obj/item/clothing/head/maid_headband + greyscale_config_worn_teshari = /datum/greyscale_config/bubber_maid_headband/worn/teshari + +// new maid headband - teshari +/obj/item/clothing/head/costume/maid_headband + greyscale_config_worn_teshari = /datum/greyscale_config/maid_headband/worn/teshari diff --git a/modular_zubbers/code/modules/clothing/head/hats.dm b/modular_zubbers/code/modules/clothing/head/hats.dm index 54498c60e7f..5ffcdb97d83 100644 --- a/modular_zubbers/code/modules/clothing/head/hats.dm +++ b/modular_zubbers/code/modules/clothing/head/hats.dm @@ -120,3 +120,21 @@ desc = "A beanie for security purposes" icon_state = "security_beanie" armor_type = /datum/armor/cosmetic_sec + +/obj/item/clothing/head/costume/mailman + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi' + +/obj/item/clothing/head/fedora/det_hat + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi' + +/obj/item/clothing/head/hats/caphat + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi' + +/obj/item/clothing/head/nanotrasen_consultant + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi' + +/obj/item/clothing/head/hats/hopcap + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi' + +/obj/item/clothing/head/hats/warden/red + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm index e6630031d09..1c98fb39f66 100644 --- a/modular_zubbers/code/modules/clothing/head/helmet.dm +++ b/modular_zubbers/code/modules/clothing/head/helmet.dm @@ -642,6 +642,7 @@ icon_state = "security_maid" icon = 'modular_zubbers/icons/obj/clothing/head/helmet.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/head/helmet.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' armor_type = /datum/armor/head_helmet strip_delay = 60 @@ -737,4 +738,20 @@ icon_state = "hos_helmet" armor_type = /datum/armor/hats_hos +/obj/item/clothing/head/helmet/blueshirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' +/obj/item/clothing/head/utility/hardhat + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/utility_teshari.dmi' + +/obj/item/clothing/head/helmet/space/emergency + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' + +/obj/item/clothing/head/syndicatefake + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' + +/obj/item/clothing/head/helmet/space/syndicate/black/red + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' + +/obj/item/clothing/head/helmet/sec + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/head/jobs.dm b/modular_zubbers/code/modules/clothing/head/jobs.dm index 1ab32c0e799..2d06271a442 100644 --- a/modular_zubbers/code/modules/clothing/head/jobs.dm +++ b/modular_zubbers/code/modules/clothing/head/jobs.dm @@ -60,3 +60,9 @@ fire = 20 acid = 50 wound = 4 + +/obj/item/clothing/head/utility/surgerycap/black + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/utility_teshari.dmi' + +/obj/item/clothing/head/utility/chefhat + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/utility_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/mask/costume.dm b/modular_zubbers/code/modules/clothing/mask/costume.dm new file mode 100644 index 00000000000..3cbdd0ddf10 --- /dev/null +++ b/modular_zubbers/code/modules/clothing/mask/costume.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/mask/fakemoustache + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/mask/mask_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/mask/gasmask.dm b/modular_zubbers/code/modules/clothing/mask/gasmask.dm index 0cc2819922c..5d12a3f0bb1 100644 --- a/modular_zubbers/code/modules/clothing/mask/gasmask.dm +++ b/modular_zubbers/code/modules/clothing/mask/gasmask.dm @@ -99,3 +99,6 @@ return speech_args[SPEECH_SPANS] |= SPAN_ROBOT + +/obj/item/clothing/mask/gas/sechailer + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/mask/mask_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/neck/cloaks.dm b/modular_zubbers/code/modules/clothing/neck/cloaks.dm index d83384ef913..bace08c353b 100644 --- a/modular_zubbers/code/modules/clothing/neck/cloaks.dm +++ b/modular_zubbers/code/modules/clothing/neck/cloaks.dm @@ -5,3 +5,9 @@ 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" + +/obj/item/clothing/neck/cloak/colourable/boat + greyscale_config_worn_teshari = /datum/greyscale_config/cloak/boat/worn/teshari + +/obj/item/clothing/neck/cloak/colourable/shroud + greyscale_config_worn_teshari = /datum/greyscale_config/cloak/shroud/worn/teshari diff --git a/modular_zubbers/code/modules/clothing/neck/neck.dm b/modular_zubbers/code/modules/clothing/neck/neck.dm index c60055e0421..578201e4ca6 100644 --- a/modular_zubbers/code/modules/clothing/neck/neck.dm +++ b/modular_zubbers/code/modules/clothing/neck/neck.dm @@ -700,3 +700,21 @@ greyscale_colors = null greyscale_config = null greyscale_config_worn = null + +/obj/item/clothing/neck/maid_neck_cover + greyscale_config_worn_teshari = /datum/greyscale_config/bubber_maid_neck_cover/worn/teshari + +/obj/item/clothing/neck/tie/detective + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi' + +/obj/item/clothing/neck/large_scarf + greyscale_config_worn_teshari = /datum/greyscale_config/scarf/worn/teshari + +/obj/item/clothing/neck/link_scryer + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi' + +/obj/item/clothing/neck/bowtie + greyscale_config_worn_teshari = /datum/greyscale_config/ties/worn/teshari + +/obj/item/clothing/neck/tie + greyscale_config_worn_teshari = /datum/greyscale_config/ties/worn/teshari diff --git a/modular_zubbers/code/modules/clothing/outfits/outlast.dm b/modular_zubbers/code/modules/clothing/outfits/outlast.dm index ded31bcbab2..a7dbe7ed4b2 100644 --- a/modular_zubbers/code/modules/clothing/outfits/outlast.dm +++ b/modular_zubbers/code/modules/clothing/outfits/outlast.dm @@ -4,6 +4,7 @@ icon = 'modular_zubbers/icons/obj/clothing/outlast.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/outlast.dmi' worn_icon_digi = 'modular_zubbers/icons/mob/clothing/outlast.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/misc_teshari.dmi' icon_state = "leatherapron" body_parts_covered = CHEST|GROIN allowed = list( diff --git a/modular_zubbers/code/modules/clothing/shoes/boots.dm b/modular_zubbers/code/modules/clothing/shoes/boots.dm index e830249f017..4d616c585a5 100644 --- a/modular_zubbers/code/modules/clothing/shoes/boots.dm +++ b/modular_zubbers/code/modules/clothing/shoes/boots.dm @@ -424,3 +424,10 @@ /obj/item/clothing/shoes/jackboots/elofy worn_icon_digi = 'modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi' worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi' + +/obj/item/clothing/shoes/workboots + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi' + +/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots + greyscale_config_worn_digi = /datum/greyscale_config/primitive_catgirl_boots/worn/digi + greyscale_config_worn_teshari = /datum/greyscale_config/primitive_catgirl_boots/worn/teshari diff --git a/modular_zubbers/code/modules/clothing/suits/armor.dm b/modular_zubbers/code/modules/clothing/suits/armor.dm index fc0c1000d23..64b5849514a 100644 --- a/modular_zubbers/code/modules/clothing/suits/armor.dm +++ b/modular_zubbers/code/modules/clothing/suits/armor.dm @@ -52,6 +52,7 @@ desc = "An armored durathread apron. This relatively innocent at first glance outfit is actually the specialized type worn by Nanotrasen's infamous high profile 'Cleaning and Clearing' kill squads. It's a lot more robust than it's janitorial counterpart. There are loops on the back for holding your 'mop'." icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' icon_state = "security_maid" allowed = list( /obj/item/access_key, @@ -266,3 +267,30 @@ /obj/item/clothing/head/hooded/cultlain_hood worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/blueshirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/alt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/customs_agent + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/alt/sec + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/warden + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/warden/alt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/capcarapace + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/blueshield/jacket + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/hop + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/suits/jacket.dm b/modular_zubbers/code/modules/clothing/suits/jacket.dm index e9856678498..e0c3b85e457 100644 --- a/modular_zubbers/code/modules/clothing/suits/jacket.dm +++ b/modular_zubbers/code/modules/clothing/suits/jacket.dm @@ -1097,3 +1097,15 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON gets_cropped_on_taurs = FALSE slot_flags = ITEM_SLOT_OCLOTHING|ITEM_SLOT_NECK + +/obj/item/clothing/suit/toggle/labcoat/technical/cargo + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi' + +/obj/item/clothing/suit/toggle/jacket/corrections_officer + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi' + +/obj/item/clothing/suit/toggle/jacket/det_trench + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/nanotrasen_consultant + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/suits/jobs.dm b/modular_zubbers/code/modules/clothing/suits/jobs.dm index f4a4b43c6b8..8675d06f19d 100644 --- a/modular_zubbers/code/modules/clothing/suits/jobs.dm +++ b/modular_zubbers/code/modules/clothing/suits/jobs.dm @@ -1,2 +1,32 @@ /obj/item/clothing/suit/apron/overalls greyscale_config_worn_teshari = /datum/greyscale_config/overalls/worn/teshari + +/obj/item/clothing/suit/toggle/cargo_tech + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi' + +/obj/item/clothing/suit/hazardvest + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi' + +/obj/item/clothing/suit/hazardvest/press + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi' + +/obj/item/clothing/suit/caution + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi' + +/obj/item/clothing/suit/atmos_overalls + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/engineering_guard + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + +/obj/item/clothing/suit/utility/fire/firefighter + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi' + +/obj/item/clothing/suit/toggle/lawyer + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi' + +/obj/item/clothing/suit/toggle/chef + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/suits/labcoat.dm b/modular_zubbers/code/modules/clothing/suits/labcoat.dm index a966e911642..1a98a1fe04b 100644 --- a/modular_zubbers/code/modules/clothing/suits/labcoat.dm +++ b/modular_zubbers/code/modules/clothing/suits/labcoat.dm @@ -129,6 +129,7 @@ name = "telecomms technical jacket" desc = "A comfortable jacket in engineering yellow with blue telecomms trim." icon_state = "technical_tcomm" + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/labcoat_teshari.dmi' /obj/item/clothing/suit/toggle/labcoat/technical/medical name = "medical technical jacket" @@ -180,3 +181,6 @@ /obj/item/clothing/suit/toggle/labcoat/technical/service/guard name = "service praetorian jacket" armor_type = /datum/armor/dept_guard + +/obj/item/clothing/suit/toggle/labcoat/paramedic + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/labcoat_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/suits/misc.dm b/modular_zubbers/code/modules/clothing/suits/misc.dm index 198f17cea9f..29e200e397a 100644 --- a/modular_zubbers/code/modules/clothing/suits/misc.dm +++ b/modular_zubbers/code/modules/clothing/suits/misc.dm @@ -154,3 +154,6 @@ /obj/item/clothing/suit/costume/wellworn_shirt/messy/graphic greyscale_config_worn_digi = /datum/greyscale_config/messyworn_shirt_graphic/worn/digi greyscale_config_worn_teshari = /datum/greyscale_config/messyworn_shirt_graphic/worn/teshari + +/obj/item/clothing/suit/space/emergency + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/spacesuit_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/suits/utility.dm b/modular_zubbers/code/modules/clothing/suits/utility.dm new file mode 100644 index 00000000000..a58d04d2824 --- /dev/null +++ b/modular_zubbers/code/modules/clothing/suits/utility.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/suit/utility/radiation + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi' + +/obj/item/clothing/head/utility/radiation + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/utility_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/under/costume.dm b/modular_zubbers/code/modules/clothing/under/costume.dm index a43ed497ac3..7627e607739 100644 --- a/modular_zubbers/code/modules/clothing/under/costume.dm +++ b/modular_zubbers/code/modules/clothing/under/costume.dm @@ -75,3 +75,11 @@ /obj/item/clothing/under/pants/skyrat/jeans_ripped greyscale_config_worn_teshari = /datum/greyscale_config/jeans_ripped/worn/teshari + +// GAGS version of old maid outfit +/obj/item/clothing/under/maid_costume + greyscale_config_worn_teshari = /datum/greyscale_config/bubber_maid_costume/worn/teshari + +// new maid outfit +/obj/item/clothing/under/costume/maid + greyscale_config_worn_teshari = /datum/greyscale_config/maid/worn/teshari diff --git a/modular_zubbers/code/modules/clothing/under/jobs/cargo.dm b/modular_zubbers/code/modules/clothing/under/jobs/cargo.dm index ccdcba820c4..d5c9dbeae6c 100644 --- a/modular_zubbers/code/modules/clothing/under/jobs/cargo.dm +++ b/modular_zubbers/code/modules/clothing/under/jobs/cargo.dm @@ -1,2 +1,35 @@ /obj/item/clothing/under/rank/cargo/miner/lavaland worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/tech + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/tech/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/customs_agent + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/tech/skyrat/turtleneck + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/tech/skyrat/turtleneck/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/bitrunner + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/tech/skyrat/long + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/rank/cargo/tech/skyrat/long/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' + +/obj/item/clothing/under/misc/mailman + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/under/jobs/command.dm b/modular_zubbers/code/modules/clothing/under/jobs/command.dm index 8dafcf971b3..24235cc7b11 100644 --- a/modular_zubbers/code/modules/clothing/under/jobs/command.dm +++ b/modular_zubbers/code/modules/clothing/under/jobs/command.dm @@ -41,3 +41,12 @@ . = ..() AddElement(/datum/element/gags_recolorable) update_icon(UPDATE_OVERLAYS) + +/obj/item/clothing/under/rank/captain + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/command_teshari.dmi' + +/obj/item/clothing/under/rank/blueshield + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/command_teshari.dmi' + +/obj/item/clothing/under/rank/civilian/head_of_personnel + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/civilian_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/under/jobs/engineering.dm b/modular_zubbers/code/modules/clothing/under/jobs/engineering.dm new file mode 100644 index 00000000000..658dc4fd678 --- /dev/null +++ b/modular_zubbers/code/modules/clothing/under/jobs/engineering.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/under/rank/engineering + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/engineering_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/under/jobs/medical.dm b/modular_zubbers/code/modules/clothing/under/jobs/medical.dm new file mode 100644 index 00000000000..c5d915a0543 --- /dev/null +++ b/modular_zubbers/code/modules/clothing/under/jobs/medical.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/under/rank/medical/scrubs/coroner + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/medical_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/under/jobs/rnd.dm b/modular_zubbers/code/modules/clothing/under/jobs/rnd.dm index 70c327f95a9..6688f621b7a 100644 --- a/modular_zubbers/code/modules/clothing/under/jobs/rnd.dm +++ b/modular_zubbers/code/modules/clothing/under/jobs/rnd.dm @@ -20,3 +20,21 @@ icon = 'modular_zubbers/icons/obj/clothing/under/rnd.dmi' icon_state = "robotics_skirt_new_2" worn_icon = 'modular_zubbers/icons/mob/clothing/under/rnd.dmi' + +/obj/item/clothing/under/rank/rnd/scientist + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi' + +/obj/item/clothing/under/rank/rnd/scientist/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi' + +/obj/item/clothing/under/rank/rnd/roboticist + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi' + +/obj/item/clothing/under/rank/rnd/roboticist/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi' + +/obj/item/clothing/under/rank/rnd/geneticist + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi' + +/obj/item/clothing/under/rank/rnd/geneticist/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/under/misc.dm b/modular_zubbers/code/modules/clothing/under/misc.dm index b0f688962a1..177f88b8f5f 100644 --- a/modular_zubbers/code/modules/clothing/under/misc.dm +++ b/modular_zubbers/code/modules/clothing/under/misc.dm @@ -724,3 +724,33 @@ /obj/item/clothing/under/colonial/nri_police worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/uniform_teshari.dmi' + +/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/medical_teshari.dmi' + +/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/engineering_guard + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/engineering_teshari.dmi' + +/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi' + +/obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/bouncer + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/civilian_teshari.dmi' + +/obj/item/clothing/under/sweater + greyscale_config_worn_teshari = /datum/greyscale_config/cableknit_sweater/worn/teshari + +/obj/item/clothing/under/trek + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi' + +/obj/item/clothing/under/trek/command + greyscale_config_worn_teshari = /datum/greyscale_config/trek/worn/teshari + +/obj/item/clothing/under/trek/engsec + greyscale_config_worn_teshari = /datum/greyscale_config/trek/worn/teshari + +/obj/item/clothing/under/trek/medsci + greyscale_config_worn_teshari = /datum/greyscale_config/trek/worn/teshari + +/obj/item/clothing/under/rank/barber + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/civilian_teshari.dmi' diff --git a/modular_zubbers/code/modules/clothing/under/security.dm b/modular_zubbers/code/modules/clothing/under/security.dm index 177bc0d29ee..d552ddc9ca1 100644 --- a/modular_zubbers/code/modules/clothing/under/security.dm +++ b/modular_zubbers/code/modules/clothing/under/security.dm @@ -20,6 +20,7 @@ icon = 'modular_zubbers/icons/obj/clothing/under/maidsec.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/under/maidsec.dmi' worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/maidsec_d.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/maidsec_teshari.dmi' //Metro Cops @@ -593,3 +594,22 @@ /obj/item/clothing/under/rank/security/peacekeeper/armadyne worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/centcom_digi.dmi' worn_icon_teshari = 'modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi' + +/obj/item/clothing/under/rank/security/officer + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/security_teshari.dmi' + +/obj/item/clothing/under/rank/security/officer/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/security_teshari.dmi' + +/obj/item/clothing/under/rank/security/corrections_officer/sweater + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/security_teshari.dmi' + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/rank/security/detective + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/security_teshari.dmi' + +/obj/item/clothing/under/rank/security/detective/skirt + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/security_teshari.dmi' + +/obj/item/clothing/under/rank/prisoner + greyscale_config_worn_teshari = /datum/greyscale_config/jumpsuit/prison/worn/teshari diff --git a/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm b/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm index 7e2a9071ebb..cb613ddb563 100644 --- a/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm +++ b/modular_zubbers/code/modules/clothing/under/skirts_dresses.dm @@ -17,6 +17,7 @@ greyscale_colors = "#39393f#ffffff#ffffff" greyscale_config = /datum/greyscale_config/miniskirt greyscale_config_worn = /datum/greyscale_config/miniskirt_worn + greyscale_config_worn_teshari = /datum/greyscale_config/miniskirt_worn/teshari flags_1 = IS_PLAYER_COLORABLE_1 alt_covers_chest = TRUE female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY diff --git a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm index a1afa4cf950..a46064a2fad 100644 --- a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm +++ b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm @@ -231,6 +231,7 @@ desc = "A pair of security gloves." icon = 'icons/obj/clothing/gloves.dmi' worn_icon = 'icons/mob/clothing/hands.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/gloves/gloves_teshari.dmi' icon_state = "sec" /obj/item/clothing/gloves/color/black/security/setup_reskins() @@ -280,6 +281,7 @@ icon_state = "armor_sec" /obj/item/clothing/suit/armor/hos + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/suit/armor/hos/Initialize(mapload) @@ -427,6 +429,7 @@ /obj/item/clothing/under/rank/security/warden icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/security_teshari.dmi' icon_state = "rwarden" /obj/item/clothing/under/rank/security/warden/formal @@ -441,6 +444,7 @@ /obj/item/clothing/under/rank/security/head_of_security icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/under/security_teshari.dmi' icon_state = "rhos" /obj/item/clothing/under/rank/security/head_of_security/parade @@ -582,6 +586,7 @@ icon_state = "jackboots_sec" icon = 'icons/obj/clothing/shoes.dmi' worn_icon = 'icons/mob/clothing/feet.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi' clothing_traits = list(TRAIT_SILENT_FOOTSTEPS) // We have other footsteps. /obj/item/clothing/shoes/jackboots/sec/Initialize(mapload) @@ -729,6 +734,7 @@ /obj/item/storage/belt/holster/detective name = "detective's holster" desc = "A holster able to carry handguns and extra ammo, thanks to an additional hand-sewn pouch. WARNING: Badasses only." + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/belts/belts_teshari.dmi' /datum/storage/holster/detective max_slots = 4 diff --git a/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm b/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm index f5da552e1df..ff616f37a90 100644 --- a/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm +++ b/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm @@ -48,6 +48,7 @@ desc = "A security medic's armor vest, with little pockets for little things." icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' icon_state = "secmed_armor" worn_icon_state = "secmed_armor" supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/modular_zubbers/icons/mob/clothing/accessories_teshari.dmi b/modular_zubbers/icons/mob/clothing/accessories_teshari.dmi new file mode 100644 index 00000000000..8c619512c70 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/accessories_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/belts/belts_teshari.dmi b/modular_zubbers/icons/mob/clothing/belts/belts_teshari.dmi new file mode 100644 index 00000000000..1e6e24494b0 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/belts/belts_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/ears_teshari.dmi b/modular_zubbers/icons/mob/clothing/ears_teshari.dmi new file mode 100644 index 00000000000..cb920cbbcea Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/ears_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/eyes_teshari.dmi b/modular_zubbers/icons/mob/clothing/eyes_teshari.dmi new file mode 100644 index 00000000000..c35b6c3d877 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/eyes_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi b/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi index 898f39079a6..020396d1f82 100644 Binary files a/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi b/modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi index de20605216a..70f145dc1fe 100644 Binary files a/modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/gloves/gloves_teshari.dmi b/modular_zubbers/icons/mob/clothing/gloves/gloves_teshari.dmi index 5ef7d6173df..fd746564c93 100644 Binary files a/modular_zubbers/icons/mob/clothing/gloves/gloves_teshari.dmi and b/modular_zubbers/icons/mob/clothing/gloves/gloves_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi b/modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi index f47ff2f42f0..ba4da912939 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi and b/modular_zubbers/icons/mob/clothing/head/costume_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi b/modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi index d8506749424..f37ab65cb33 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi and b/modular_zubbers/icons/mob/clothing/head/hats_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi b/modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi index 7edebeb7a56..46f0fa039a4 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi and b/modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/utility_teshari.dmi b/modular_zubbers/icons/mob/clothing/head/utility_teshari.dmi new file mode 100644 index 00000000000..f8de3c8267a Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/head/utility_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/mask/mask_teshari.dmi b/modular_zubbers/icons/mob/clothing/mask/mask_teshari.dmi index 6eceb4976be..b8e467f2442 100644 Binary files a/modular_zubbers/icons/mob/clothing/mask/mask_teshari.dmi and b/modular_zubbers/icons/mob/clothing/mask/mask_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi b/modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi index 3889afdfe8f..33af878b812 100644 Binary files a/modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi and b/modular_zubbers/icons/mob/clothing/neck/neck_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor.dmi b/modular_zubbers/icons/mob/clothing/suits/armor.dmi index 28c8e7f6cca..5faa8d9f6f5 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/armor.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi index 1c258351dd9..d77c9c1b639 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi index b2f9db4a48a..d3b5a3991f3 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi and b/modular_zubbers/icons/mob/clothing/suits/jacket_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/labcoat_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/labcoat_teshari.dmi index f75edf970bc..8581eba66c4 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/labcoat_teshari.dmi and b/modular_zubbers/icons/mob/clothing/suits/labcoat_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/misc_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/misc_teshari.dmi index 81a8c40076d..76e6e241f70 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/misc_teshari.dmi and b/modular_zubbers/icons/mob/clothing/suits/misc_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/spacesuit_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/spacesuit_teshari.dmi index 041802ce429..7c7a346a140 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/spacesuit_teshari.dmi and b/modular_zubbers/icons/mob/clothing/suits/spacesuit_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi index 37ff8653c84..e184ed4b2c9 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi and b/modular_zubbers/icons/mob/clothing/suits/utility_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/captain_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/captain_teshari.dmi new file mode 100644 index 00000000000..5fbf313e89d Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/captain_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi index 48e5e0abf20..04d2540d1c0 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi and b/modular_zubbers/icons/mob/clothing/under/cargo_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/civilian_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/civilian_teshari.dmi index b633942d37f..9d3cc96fb66 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/civilian_teshari.dmi and b/modular_zubbers/icons/mob/clothing/under/civilian_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/command_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/command_teshari.dmi new file mode 100644 index 00000000000..5213ddf8692 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/command_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi index 989e978d140..a8d2e95aa16 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi and b/modular_zubbers/icons/mob/clothing/under/costume_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/engineering_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/engineering_teshari.dmi new file mode 100644 index 00000000000..18b4d638732 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/engineering_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/maidsec_d.dmi b/modular_zubbers/icons/mob/clothing/under/maidsec_d.dmi index e2e0d10f4f7..33abfe34e4f 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/maidsec_d.dmi and b/modular_zubbers/icons/mob/clothing/under/maidsec_d.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/maidsec_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/maidsec_teshari.dmi new file mode 100644 index 00000000000..750a1ef7c08 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/maidsec_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/medical_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/medical_teshari.dmi new file mode 100644 index 00000000000..a20329289a6 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/medical_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi new file mode 100644 index 00000000000..630c3fd942d Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/rnd_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/security_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/security_teshari.dmi index 10ea6ca955d..deb67e2b56c 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/security_teshari.dmi and b/modular_zubbers/icons/mob/clothing/under/security_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/skirts_dresses_teshari.dmi b/modular_zubbers/icons/mob/clothing/under/skirts_dresses_teshari.dmi index 961746c49d3..9a2b456b79d 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/skirts_dresses_teshari.dmi and b/modular_zubbers/icons/mob/clothing/under/skirts_dresses_teshari.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 988e9f8eab1..c24b09c7605 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9646,6 +9646,7 @@ #include "modular_zubbers\code\modules\clothing\armor_overrides\hos_armor.dm" #include "modular_zubbers\code\modules\clothing\belts\webbings.dm" #include "modular_zubbers\code\modules\clothing\clothing_overrides\centcom.dm" +#include "modular_zubbers\code\modules\clothing\ears\headset.dm" #include "modular_zubbers\code\modules\clothing\glasses\hud.dm" #include "modular_zubbers\code\modules\clothing\glasses\nerd.dm" #include "modular_zubbers\code\modules\clothing\gloves\clown.dm" @@ -9659,6 +9660,7 @@ #include "modular_zubbers\code\modules\clothing\head\sombrero.dm" #include "modular_zubbers\code\modules\clothing\head\wig.dm" #include "modular_zubbers\code\modules\clothing\mask\clown.dm" +#include "modular_zubbers\code\modules\clothing\mask\costume.dm" #include "modular_zubbers\code\modules\clothing\mask\gasmask.dm" #include "modular_zubbers\code\modules\clothing\neck\cloaks.dm" #include "modular_zubbers\code\modules\clothing\neck\collars.dm" @@ -9679,6 +9681,7 @@ #include "modular_zubbers\code\modules\clothing\suits\labcoat.dm" #include "modular_zubbers\code\modules\clothing\suits\misc.dm" #include "modular_zubbers\code\modules\clothing\suits\nerd.dm" +#include "modular_zubbers\code\modules\clothing\suits\utility.dm" #include "modular_zubbers\code\modules\clothing\suits\wintercoats.dm" #include "modular_zubbers\code\modules\clothing\under\_under.dm" #include "modular_zubbers\code\modules\clothing\under\ba_cheerleader.dm" @@ -9692,6 +9695,8 @@ #include "modular_zubbers\code\modules\clothing\under\accessories\badges.dm" #include "modular_zubbers\code\modules\clothing\under\jobs\cargo.dm" #include "modular_zubbers\code\modules\clothing\under\jobs\command.dm" +#include "modular_zubbers\code\modules\clothing\under\jobs\engineering.dm" +#include "modular_zubbers\code\modules\clothing\under\jobs\medical.dm" #include "modular_zubbers\code\modules\clothing\under\jobs\rnd.dm" #include "modular_zubbers\code\modules\clothing\under\jobs\civilian\clown_mime.dm" #include "modular_zubbers\code\modules\clothing\under\jobs\civilian\curator.dm"