cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11144 from VOREStation/Fixes/11143

Browse Source 
Teshari cloak/suit/various fixes
This commit is contained in:
Aronai Sieyes
2021-07-19 17:16:26 -04:00
committed by GitHub
parent b8e78221e6 25d2ab9e29
commit bb25cb43d6
7 changed files with 14 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/aliens/teshari.dm
+9 -145
View File
@@ -3,131 +3,105 @@
name = "black cloak"
desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside."
icon = 'icons/inventory/suit/item_teshari.dmi'
default_worn_icon = 'icons/inventory/suit/mob_teshari.dmi'
icon_state = "tesh_cloak_bn"
item_state = "tesh_cloak_bn"
species_restricted = list(SPECIES_TESHARI)
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_red
name = "black and red cloak"
icon_state = "tesh_cloak_br"
item_state = "tesh_cloak_br"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_orange
name = "black and orange cloak"
icon_state = "tesh_cloak_bo"
item_state = "tesh_cloak_bo"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_yellow
name = "black and yellow cloak"
icon_state = "tesh_cloak_by"
item_state = "tesh_cloak_by"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_green
name = "black and green cloak"
icon_state = "tesh_cloak_bgr"
item_state = "tesh_cloak_bgr"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_blue
name = "black and blue cloak"
icon_state = "tesh_cloak_bbl"
item_state = "tesh_cloak_bbl"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_purple
name = "black and purple cloak"
icon_state = "tesh_cloak_bp"
item_state = "tesh_cloak_bp"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_pink
name = "black and pink cloak"
icon_state = "tesh_cloak_bpi"
item_state = "tesh_cloak_bpi"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_brown
name = "black and brown cloak"
icon_state = "tesh_cloak_bbr"
item_state = "tesh_cloak_bbr"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_grey
name = "black and grey cloak"
icon_state = "tesh_cloak_bg"
item_state = "tesh_cloak_bg"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_white
name = "black and white cloak"
icon_state = "tesh_cloak_bw"
item_state = "tesh_cloak_bw"
/obj/item/clothing/suit/storage/teshari/cloak/standard/white
name = "white cloak"
icon_state = "tesh_cloak_wn"
item_state = "tesh_cloak_wn"
/obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey
name = "white and grey cloak"
icon_state = "tesh_cloak_wg"
item_state = "tesh_cloak_wg"
/obj/item/clothing/suit/storage/teshari/cloak/standard/red_grey
name = "red and grey cloak"
icon_state = "tesh_cloak_rg"
item_state = "tesh_cloak_rg"
/obj/item/clothing/suit/storage/teshari/cloak/standard/orange_grey
name = "orange and grey cloak"
icon_state = "tesh_cloak_og"
item_state = "tesh_cloak_og"
/obj/item/clothing/suit/storage/teshari/cloak/standard/yellow_grey
name = "yellow and grey cloak"
icon_state = "tesh_cloak_yg"
item_state = "tesh_cloak_yg"
/obj/item/clothing/suit/storage/teshari/cloak/standard/green_grey
name = "green and grey cloak"
icon_state = "tesh_cloak_gg"
item_state = "tesh_cloak_gg"
/obj/item/clothing/suit/storage/teshari/cloak/standard/blue_grey
name = "blue and grey cloak"
icon_state = "tesh_cloak_blug"
item_state = "tesh_cloak_blug"
/obj/item/clothing/suit/storage/teshari/cloak/standard/purple_grey
name = "purple and grey cloak"
icon_state = "tesh_cloak_pg"
item_state = "tesh_cloak_pg"
/obj/item/clothing/suit/storage/teshari/cloak/standard/pink_grey
name = "pink and grey cloak"
icon_state = "tesh_cloak_pig"
item_state = "tesh_cloak_pig"
/obj/item/clothing/suit/storage/teshari/cloak/standard/brown_grey
name = "brown and grey cloak"
icon_state = "tesh_cloak_brg"
item_state = "tesh_cloak_brg"
/obj/item/clothing/suit/storage/teshari/cloak/standard/rainbow
name = "rainbow cloak"
icon_state = "tesh_cloak_rainbow"
item_state = "tesh_cloak_rainbow"
/obj/item/clothing/suit/storage/teshari/cloak/standard/orange
name = "orange cloak"
icon_state = "tesh_cloak_on"
item_state = "tesh_cloak_on"
/obj/item/clothing/suit/storage/teshari/cloak/standard/dark_retrowave
name = "dark aesthetic cloak"
icon_state = "tesh_cloak_dretrowave"
item_state = "tesh_cloak_dretrowave"
/obj/item/clothing/suit/storage/teshari/cloak/standard/black_glow
name = "black and glowing cloak"
icon_state = "tesh_cloak_bglowing"
item_state = "tesh_cloak_bglowing"
// Job Cloaks
@@ -135,7 +109,6 @@
name = "facility director cloak"
desc = "A soft Teshari cloak made for the Facility Director"
icon_state = "tesh_cloak_cap"
item_state = "tesh_cloak_cap"
//Cargo
@@ -143,19 +116,16 @@
name = "quartermaster cloak"
desc = "A soft Teshari cloak made for the Quartermaster"
icon_state = "tesh_cloak_qm"
item_state = "tesh_cloak_qm"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo
name = "cargo cloak"
desc = "A soft Teshari cloak made for the Cargo department"
icon_state = "tesh_cloak_car"
item_state = "tesh_cloak_car"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/mining
name = "mining cloak"
desc = "A soft Teshari cloak made for Mining"
icon_state = "tesh_cloak_mine"
item_state = "tesh_cloak_mine"
//Engineering
@@ -163,19 +133,16 @@
name = "cheif engineer cloak"
desc = "A soft Teshari cloak made the Chief Engineer"
icon_state = "tesh_cloak_ce"
item_state = "tesh_cloak_ce"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer
name = "engineering cloak"
desc = "A soft Teshari cloak made for the Engineering department"
icon_state = "tesh_cloak_engie"
item_state = "tesh_cloak_engie"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos
name = "atmospherics cloak"
desc = "A soft Teshari cloak made for the Atmospheric Technician"
icon_state = "tesh_cloak_atmos"
item_state = "tesh_cloak_atmos"
//Medical
@@ -183,37 +150,31 @@
name = "chief medical officer cloak"
desc = "A soft Teshari cloak made the Cheif Medical Officer"
icon_state = "tesh_cloak_cmo"
item_state = "tesh_cloak_cmo"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/medical
name = "medical cloak"
desc = "A soft Teshari cloak made for the Medical department"
icon_state = "tesh_cloak_doc"
item_state = "tesh_cloak_doc"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry
name = "chemist cloak"
desc = "A soft Teshari cloak made for the Chemist"
icon_state = "tesh_cloak_chem"
item_state = "tesh_cloak_chem"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/viro
name = "virologist cloak"
desc = "A soft Teshari cloak made for the Virologist"
icon_state = "tesh_cloak_viro"
item_state = "tesh_cloak_viro"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/para
name = "paramedic cloak"
desc = "A soft Teshari cloak made for the Paramedic"
icon_state = "tesh_cloak_para"
item_state = "tesh_cloak_para"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/psych
name = " psychiatrist cloak"
desc = "A soft Teshari cloak made for the Psychiatrist"
icon_state = "tesh_cloak_psych"
item_state = "tesh_cloak_psych"
//Science
@@ -221,19 +182,16 @@
name = "research director cloak"
desc = "A soft Teshari cloak made for the Research Director"
icon_state = "tesh_cloak_rd"
item_state = "tesh_cloak_rd"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/sci
name = "scientist cloak"
desc = "A soft Teshari cloak made for the Science department"
icon_state = "tesh_cloak_sci"
item_state = "tesh_cloak_sci"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/robo
name = "roboticist cloak"
desc = "A soft Teshari cloak made for the Roboticist"
icon_state = "tesh_cloak_robo"
item_state = "tesh_cloak_robo"
//Security
@@ -241,19 +199,16 @@
name = "head of security cloak"
desc = "A soft Teshari cloak made for the Head of Security"
icon_state = "tesh_cloak_hos"
item_state = "tesh_cloak_hos"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/sec
name = "security cloak"
desc = "A soft Teshari cloak made for the Security department"
icon_state = "tesh_cloak_sec"
item_state = "tesh_cloak_sec"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa
name = "internal affairs cloak"
desc = "A soft Teshari cloak made for the Internal Affairs Agent"
icon_state = "tesh_cloak_iaa"
item_state = "tesh_cloak_iaa"
//Service
@@ -261,25 +216,25 @@
name = "head of personnel cloak"
desc = "A soft Teshari cloak made for the Head of Personnel"
icon_state = "tesh_cloak_hop"
item_state = "tesh_cloak_hop"
/obj/item/clothing/suit/storage/teshari/cloak/jobs/service
name = "service cloak"
desc = "A soft Teshari cloak made for the Service department"
icon_state = "tesh_cloak_serv"
item_state = "tesh_cloak_serv"
//Misc
/obj/item/clothing/suit/storage/toggle/labcoat/teshari
name = "Teshari labcoat"
desc = "A small suit that protects against minor chemical spills. This one is a good fit on Teshari."
icon = 'icons/inventory/suit/item_teshari.dmi'
icon_state = "tesh_labcoat"
species_restricted = list(SPECIES_TESHARI)
/obj/item/clothing/suit/storage/toggle/tesharicoat
name = "small black coat"
desc = "A coat that seems too small to fit a human."
icon = 'icons/inventory/suit/item_teshari.dmi'
icon_state = "tesharicoat"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS
species_restricted = list(SPECIES_TESHARI)
@@ -287,6 +242,7 @@
/obj/item/clothing/suit/storage/toggle/tesharicoatwhite
name = "small coat"
desc = "A coat that seems too small to fit a human."
icon = 'icons/inventory/suit/item_teshari.dmi'
icon_state = "tesharicoatwhite"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS
species_restricted = list(SPECIES_TESHARI)
@@ -295,11 +251,11 @@
/obj/item/clothing/suit/storage/hooded/teshari
name = "Hooded Teshari Cloak"
desc = "A soft teshari cloak with an added hood."
icon = 'icons/inventory/suit/item_teshari.dmi'
icon_state = "tesh_hcloak_bo"
item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_inv = HIDEHOLSTER|HIDETIE
//hooded = 1 Variable no longer exists, hood is now handled by code/modules/clothing/suit/storage/hooded.dm
action_button_name = "Toggle Cloak Hood"
hoodtype = /obj/item/clothing/head/tesh_hood
allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
@@ -307,7 +263,10 @@
/obj/item/clothing/head/tesh_hood
name = "Cloak Hood"
desc = "A hood attached to a teshari cloak."
icon = 'icons/inventory/suit/item_teshari.dmi'
default_worn_icon = 'icons/inventory/suit/mob_teshari.dmi'
icon_state = "tesh_hood_bo"
sprite_sheets = null
item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo")
flags_inv = BLOCKHAIR
body_parts_covered = HEAD
@@ -315,531 +274,436 @@
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange
name = "black and orange hooded cloak"
icon_state = "tesh_hcloak_bo"
item_state = "tesh_hcloak_bo"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_orange
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_grey
name = "black and grey hooded cloak"
icon_state = "tesh_hcloak_bg"
item_state = "tesh_hcloak_bg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_midgrey
name = "black and medium grey hooded cloak"
icon_state = "tesh_hcloak_bmg"
item_state = "tesh_hcloak_bmg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_midgrey
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_lightgrey
name = "black and light grey hooded cloak"
icon_state = "tesh_hcloak_blg"
item_state = "tesh_hcloak_blg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_lightgrey
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_white
name = "black and white hooded cloak"
icon_state = "tesh_hcloak_bw"
item_state = "tesh_hcloak_bw"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_white
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_red
name = "black and red hooded cloak"
icon_state = "tesh_hcloak_br"
item_state = "tesh_hcloak_br"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_red
/obj/item/clothing/suit/storage/hooded/teshari/standard/black
name = "black hooded cloak"
icon_state = "tesh_hcloak_bn"
item_state = "tesh_hcloak_bn"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_yellow
name = "black and yellow hooded cloak"
icon_state = "tesh_hcloak_by"
item_state = "tesh_hcloak_by"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_yellow
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_green
name = "black and green hooded cloak"
icon_state = "tesh_hcloak_bgr"
item_state = "tesh_hcloak_bgr"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_green
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_blue
name = "black and blue hooded cloak"
icon_state = "tesh_hcloak_bbl"
item_state = "tesh_hcloak_bbl"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_blue
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_purple
name = "black and purple hooded cloak"
icon_state = "tesh_hcloak_bp"
item_state = "tesh_hcloak_bp"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_purple
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_pink
name = "black and pink hooded cloak"
icon_state = "tesh_hcloak_bpi"
item_state = "tesh_hcloak_bpi"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_pink
/obj/item/clothing/suit/storage/hooded/teshari/standard/black_brown
name = "black and brown hooded cloak"
icon_state = "tesh_hcloak_bbr"
item_state = "tesh_hcloak_bbr"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_brown
/obj/item/clothing/suit/storage/hooded/teshari/standard/orange_grey
name = "orange and grey hooded cloak"
icon_state = "tesh_hcloak_og"
item_state = "tesh_hcloak_og"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange_grey
///obj/item/clothing/suit/storage/hooded/teshari/standard/rainbow
// name = "rainbow hooded cloak"
// icon_state = "tesh_hcloak_rainbow"
// item_state = "tesh_hcloak_rainbow"
// hoodtype = /obj/item/clothing/head/tesh_hood/standard/rainbow
/obj/item/clothing/suit/storage/hooded/teshari/standard/lightgrey_grey
name = "light grey and grey hooded cloak"
icon_state = "tesh_hcloak_lgg"
item_state = "tesh_hcloak_lgg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/lightgrey_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/white_grey
name = "white and grey hooded cloak"
icon_state = "tesh_hcloak_wg"
item_state = "tesh_hcloak_wg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/white_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/red_grey
name = "red and grey hooded cloak"
icon_state = "tesh_hcloak_rg"
item_state = "tesh_hcloak_rg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/red_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/orange
name = "orange hooded cloak"
icon_state = "tesh_hcloak_on"
item_state = "tesh_hcloak_on"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange
/obj/item/clothing/suit/storage/hooded/teshari/standard/yellow_grey
name = "yellow and grey hooded cloak"
icon_state = "tesh_hcloak_yg"
item_state = "tesh_hcloak_yg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/yellow_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/green_grey
name = "green and grey hooded cloak"
icon_state = "tesh_hcloak_gg"
item_state = "tesh_hcloak_gg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/green_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/blue_grey
name = "blue and grey hooded cloak"
icon_state = "tesh_hcloak_blug"
item_state = "tesh_hcloak_blug"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/blue_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/purple_grey
name = "purple and grey hooded cloak"
icon_state = "tesh_hcloak_pg"
item_state = "tesh_hcloak_pg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/purple_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/pink_grey
name = "pink and grey hooded cloak"
icon_state = "tesh_hcloak_pig"
item_state = "tesh_hcloak_pig"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/pink_grey
/obj/item/clothing/suit/storage/hooded/teshari/standard/brown_grey
name = "brown and grey hooded cloak"
icon_state = "tesh_hcloak_brg"
item_state = "tesh_hcloak_brg"
hoodtype = /obj/item/clothing/head/tesh_hood/standard/brown_grey
//The actual hoods
/obj/item/clothing/head/tesh_hood/standard/black_orange
name = "black and orange cloak hood"
icon_state = "tesh_hood_bo"
item_state = "tesh_hood_bo"
/obj/item/clothing/head/tesh_hood/standard/black_grey
name = "black and grey cloak hood"
icon_state = "tesh_hood_bg"
item_state = "tesh_hood_bg"
/obj/item/clothing/head/tesh_hood/standard/black_midgrey
name = "black and medium grey cloak hood"
icon_state = "tesh_hood_bmg"
item_state = "tesh_hood_bmg"
/obj/item/clothing/head/tesh_hood/standard/black_lightgrey
name = "black and light grey cloak hood"
icon_state = "tesh_hood_blg"
item_state = "tesh_hood_blg"
/obj/item/clothing/head/tesh_hood/standard/black_white
name = "black and white cloak hood"
icon_state = "tesh_hood_bw"
item_state = "tesh_hood_bw"
/obj/item/clothing/head/tesh_hood/standard/black_red
name = "black and red cloak hood"
icon_state = "tesh_hood_br"
item_state = "tesh_hood_br"
/obj/item/clothing/head/tesh_hood/standard/black
name = "black cloak hood"
icon_state = "tesh_hood_bn"
item_state = "tesh_hood_bn"
/obj/item/clothing/head/tesh_hood/standard/black_yellow
name = "black and yellow cloak hood"
icon_state = "tesh_hood_by"
item_state = "tesh_hood_by"
/obj/item/clothing/head/tesh_hood/standard/black_green
name = "black and green cloak hood"
icon_state = "tesh_hood_bgr"
item_state = "tesh_hood_bgr"
/obj/item/clothing/head/tesh_hood/standard/black_blue
name = "black and blue cloak hood"
icon_state = "tesh_hood_bbl"
item_state = "tesh_hood_bbl"
/obj/item/clothing/head/tesh_hood/standard/black_purple
name = "black and purple cloak hood"
icon_state = "tesh_hood_bp"
item_state = "tesh_hood_bp"
/obj/item/clothing/head/tesh_hood/standard/black_pink
name = "black and pink cloak hood"
icon_state = "tesh_hood_bpi"
item_state = "tesh_hood_bpi"
/obj/item/clothing/head/tesh_hood/standard/black_brown
name = "black and brown cloak hood"
icon_state = "tesh_hood_bbr"
item_state = "tesh_hood_bbr"
/obj/item/clothing/head/tesh_hood/standard/orange_grey
name = "orange and grey cloak hood"
icon_state = "tesh_hood_og"
item_state = "tesh_hood_og"
/obj/item/clothing/head/tesh_hood/standard/rainbow
name = "rainbow cloak hood"
icon_state = "tesh_hood_rainbow"
item_state = "tesh_hood_rainbow"
/obj/item/clothing/head/tesh_hood/standard/lightgrey_grey
name = "light grey and grey cloak hood"
icon_state = "tesh_hood_lgg"
item_state = "tesh_hood_lgg"
/obj/item/clothing/head/tesh_hood/standard/white_grey
name = "white and grey cloak hood"
icon_state = "tesh_hood_wg"
item_state = "tesh_hood_wg"
/obj/item/clothing/head/tesh_hood/standard/red_grey
name = "red and grey cloak hood"
icon_state = "tesh_hood_rg"
item_state = "tesh_hood_rg"
/obj/item/clothing/head/tesh_hood/standard/orange
name = "orange cloak hood"
icon_state = "tesh_hood_on"
item_state = "tesh_hood_on"
/obj/item/clothing/head/tesh_hood/standard/yellow_grey
name = "yellow and grey cloak hood"
icon_state = "tesh_hood_yg"
item_state = "tesh_hood_yg"
/obj/item/clothing/head/tesh_hood/standard/green_grey
name = "green and grey cloak hood"
icon_state = "tesh_hood_gg"
item_state = "tesh_hood_gg"
/obj/item/clothing/head/tesh_hood/standard/blue_grey
name = "blue and grey cloak hood"
icon_state = "tesh_hood_blug"
item_state = "tesh_hood_blug"
/obj/item/clothing/head/tesh_hood/standard/purple_grey
name = "purple and grey cloak hood"
icon_state = "tesh_hood_pg"
item_state = "tesh_hood_pg"
/obj/item/clothing/head/tesh_hood/standard/pink_grey
name = "pink and grey cloak hood"
icon_state = "tesh_hood_pig"
item_state = "tesh_hood_pig"
/obj/item/clothing/head/tesh_hood/standard/brown_grey
name = "brown and grey cloak hood"
icon_state = "tesh_hood_brg"
item_state = "tesh_hood_brg"
//Belted cloaks
/obj/item/clothing/suit/storage/teshari/beltcloak
name = "belted cloak"
desc = "A more ridged and stylized Teshari cloak."
icon = 'icons/inventory/suit/item_teshari.dmi'
icon_state = "tesh_beltcloak_bo"
item_state = "tesh_beltcloak_bo"
species_restricted = list(SPECIES_TESHARI)
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_orange
name = "black belted cloak (orange)"
icon_state = "tesh_beltcloak_bo"
item_state = "tesh_beltcloak_bo"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_grey
name = "black belted cloak"
icon_state = "tesh_beltcloak_bg"
item_state = "tesh_beltcloak_bg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_midgrey
name = "black belted cloak (medium grey)"
icon_state = "tesh_beltcloak_bmg"
item_state = "tesh_beltcloak_bmg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_lightgrey
name = "black belted cloak (light grey)"
icon_state = "tesh_beltcloak_blg"
item_state = "tesh_beltcloak_blg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_white
name = "black belted cloak (white)"
icon_state = "tesh_beltcloak_bw"
item_state = "tesh_beltcloak_bw"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_red
name = "black belted cloak (red)"
icon_state = "tesh_beltcloak_br"
item_state = "tesh_beltcloak_br"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black
name = "black simple belted cloak"
icon_state = "tesh_beltcloak_bn"
item_state = "tesh_beltcloak_bn"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_yellow
name = "black belted cloak (yellow)"
icon_state = "tesh_beltcloak_by"
item_state = "tesh_beltcloak_by"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_green
name = "black belted cloak (green)"
icon_state = "tesh_beltcloak_bgr"
item_state = "tesh_beltcloak_bgr"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_blue
name = "black belted cloak (blue)"
icon_state = "tesh_beltcloak_bbl"
item_state = "tesh_beltcloak_bbl"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_purple
name = "black belted cloak (purple)"
icon_state = "tesh_beltcloak_bp"
item_state = "tesh_beltcloak_bp"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_pink
name = "black belted cloak (pink)"
icon_state = "tesh_beltcloak_bpi"
item_state = "tesh_beltcloak_bpi"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_brown
name = "black belted cloak (brown)"
icon_state = "tesh_beltcloak_bbr"
item_state = "tesh_beltcloak_bbr"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange_grey
name = "orange belted cloak"
icon_state = "tesh_beltcloak_og"
item_state = "tesh_beltcloak_og"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/rainbow
name = "rainbow belted cloak"
icon_state = "tesh_beltcloak_rainbow"
item_state = "tesh_beltcloak_rainbow"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/lightgrey_grey
name = "light grey belted cloak"
icon_state = "tesh_beltcloak_lgg"
item_state = "tesh_beltcloak_lgg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey
name = "white belted cloak"
icon_state = "tesh_beltcloak_wg"
item_state = "tesh_beltcloak_wg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/red_grey
name = "red belted cloak"
icon_state = "tesh_beltcloak_rg"
item_state = "tesh_beltcloak_rg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange
name = "orange simple belted cloak"
icon_state = "tesh_beltcloak_on"
item_state = "tesh_beltcloak_on"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/yellow_grey
name = "yellow belted cloak"
icon_state = "tesh_beltcloak_yg"
item_state = "tesh_beltcloak_yg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/green_grey
name = "green belted cloak"
icon_state = "tesh_beltcloak_gg"
item_state = "tesh_beltcloak_gg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/blue_grey
name = "blue belted cloak"
icon_state = "tesh_beltcloak_blug"
item_state = "tesh_beltcloak_blug"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/purple_grey
name = "purple belted cloak"
icon_state = "tesh_beltcloak_pg"
item_state = "tesh_beltcloak_pg"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/pink_grey
name = "pink belted cloak"
icon_state = "tesh_beltcloak_pig"
item_state = "tesh_beltcloak_pig"
/obj/item/clothing/suit/storage/teshari/beltcloak/standard/brown_grey
name = "brown belted cloak"
icon_state = "tesh_beltcloak_brg"
item_state = "tesh_beltcloak_brg"
//Belted job cloaks
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cargo
name = "cargo belted cloak"
desc = "A soft Teshari cloak made for the Cargo department"
icon_state = "tesh_beltcloak_car"
item_state = "tesh_beltcloak_car"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/mining
name = "mining belted cloak"
desc = "A soft Teshari cloak made for Mining"
icon_state = "tesh_beltcloak_mine"
item_state = "tesh_beltcloak_mine"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command
name = "command belted cloak"
desc = "A soft Teshari cloak made for the Command department"
icon_state = "tesh_beltcloak_comm"
item_state = "tesh_beltcloak_comm"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/ce
name = "chief engineer belted cloak"
desc = "A soft Teshari cloak made the Chief Engineer"
icon_state = "tesh_beltcloak_ce"
item_state = "tesh_beltcloak_ce"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/engineer
name = "engineering belted cloak"
desc = "A soft Teshari cloak made for the Engineering department"
icon_state = "tesh_beltcloak_engie"
item_state = "tesh_beltcloak_engie"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/atmos
name = "atmospherics belted cloak"
desc = "A soft Teshari cloak made for the Atmospheric Technician"
icon_state = "tesh_beltcloak_atmos"
item_state = "tesh_beltcloak_atmos"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cmo
name = "chief medical officer belted cloak"
desc = "A soft Teshari cloak made the Chief Medical Officer"
icon_state = "tesh_beltcloak_cmo"
item_state = "tesh_beltcloak_cmo"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/medical
name = "medical belted cloak"
desc = "A soft Teshari cloak made for the Medical department"
icon_state = "tesh_beltcloak_doc"
item_state = "tesh_beltcloak_doc"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/chemistry
name = "chemist belted cloak"
desc = "A soft Teshari cloak made for the Chemist"
icon_state = "tesh_beltcloak_vrem"
item_state = "tesh_beltcloak_vrem"
icon_state = "tesh_beltcloak_chem"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/viro
name = "virologist belted cloak"
desc = "A soft Teshari cloak made for the Virologist"
icon_state = "tesh_beltcloak_viro"
item_state = "tesh_beltcloak_viro"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/para
name = "paramedic belted cloak"
desc = "A soft Teshari cloak made for the Paramedic"
icon_state = "tesh_beltcloak_para"
item_state = "tesh_beltcloak_para"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sci
name = "scientist belted cloak"
desc = "A soft Teshari cloak made for the Science department"
icon_state = "tesh_beltcloak_sci"
item_state = "tesh_beltcloak_sci"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/robo
name = "roboticist belted cloak"
desc = "A soft Teshari cloak made for the Roboticist"
icon_state = "tesh_beltcloak_robo"
item_state = "tesh_beltcloak_robo"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sec
name = "security belted cloak"
desc = "A soft Teshari cloak made for the Security department"
icon_state = "tesh_beltcloak_sec"
item_state = "tesh_beltcloak_sec"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/qm
name = "quartermaster belted cloak"
desc = "A soft Teshari cloak made for the Quartermaster"
icon_state = "tesh_beltcloak_qm"
item_state = "tesh_beltcloak_qm"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/service
name = "service belted cloak"
desc = "A soft Teshari cloak made for the Service department"
icon_state = "tesh_beltcloak_serv"
item_state = "tesh_beltcloak_serv"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/iaa
name = "internal affairs belted cloak"
desc = "A soft Teshari cloak made for the Internal Affairs Agent"
icon_state = "tesh_beltcloak_iaa"
item_state = "tesh_beltcloak_iaa"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn
name = "warden belted cloak"
desc = "A soft Teshari cloak made for the Warden"
icon_state = "tesh_beltcloak_wrdn"
item_state = "tesh_beltcloak_wrdn"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/hos
name = "security chief belted cloak"
desc = "A soft Teshari cloak made for the Head of Security"
icon_state = "tesh_beltcloak_hos"
item_state = "tesh_beltcloak_hos"
/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani
name = "janitor belted cloak"
desc = "A soft Teshari cloak made for the Janitor"
icon_state = "tesh_beltcloak_jani"
item_state = "tesh_beltcloak_jani"
code/modules/clothing/under/xenos/teshari.dm
-55
View File
@@ -81,53 +81,43 @@
/obj/item/clothing/under/teshari/undercoat/standard/worksuit
name = "small black and red worksuit"
icon_state = "teshari_black_red_worksuit"
item_state = "teshari_black_red_worksuit"
desc = "A small worksuit designed for a Teshari"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple
name = "small black and purple worksuit"
icon_state = "teshari_black_purple_worksuit"
item_state = "teshari_black_purple_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange
name = "small black and orange worksuit"
icon_state = "teshari_black_orange_worksuit"
item_state = "teshari_black_orange_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue
name = "small black and blue worksuit"
icon_state = "teshari_black_blue_worksuit"
item_state = "teshari_black_blue_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen
name = "small black and greeen worksuit"
icon_state = "teshari_black_green_worksuit"
item_state = "teshari_black_green_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered
name = "small white and red worksuit"
icon_state = "teshari_white_red_worksuit"
item_state = "teshari_white_red_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple
name = "small white and purple worksuit"
icon_state = "teshari_white_purple_worksuit"
item_state = "teshari_white_purple_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange
name = "small white and orange worksuit"
icon_state = "teshari_white_orange_worksuit"
item_state = "teshari_white_orange_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue
name = "small white and blue worksuit"
icon_state = "teshari_white_blue_worksuit"
item_state = "teshari_white_blue_worksuit"
/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen
name = "small white and green worksuit"
icon_state = "teshari_white_green_worksuit"
item_state = "teshari_white_green_worksuit"
//Standard Undercoats
@@ -135,247 +125,202 @@
name = "Undercoat"
desc = "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!"
icon_state = "tesh_uniform_bo"
item_state = "tesh_uniform_bo"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/teshari/undercoat/standard/black_orange
name = "black and orange undercoat"
icon_state = "tesh_uniform_bo"
item_state = "tesh_uniform_bo"
/obj/item/clothing/under/teshari/undercoat/standard/black_grey
name = "black and grey undercoat"
icon_state = "tesh_uniform_bg"
item_state = "tesh_uniform_bg"
/obj/item/clothing/under/teshari/undercoat/standard/black_white
name = "black and white undercoat"
icon_state = "tesh_uniform_bw"
item_state = "tesh_uniform_bw"
/obj/item/clothing/under/teshari/undercoat/standard/black_red
name = "black and red undercoat"
icon_state = "tesh_uniform_br"
item_state = "tesh_uniform_br"
/obj/item/clothing/under/teshari/undercoat/standard/black
name = "black undercoat"
icon_state = "tesh_uniform_bn"
item_state = "tesh_uniform_bn"
/obj/item/clothing/under/teshari/undercoat/standard/black_yellow
name = "black and yellow undercoat"
icon_state = "tesh_uniform_by"
item_state = "tesh_uniform_by"
/obj/item/clothing/under/teshari/undercoat/standard/black_green
name = "black and green undercoat"
icon_state = "tesh_uniform_bgr"
item_state = "tesh_uniform_bgr"
/obj/item/clothing/under/teshari/undercoat/standard/black_blue
name = "black and blue undercoat"
icon_state = "tesh_uniform_bbl"
item_state = "tesh_uniform_bbl"
/obj/item/clothing/under/teshari/undercoat/standard/black_purple
name = "black and purple undercoat"
icon_state = "tesh_uniform_bp"
item_state = "tesh_uniform_bp"
/obj/item/clothing/under/teshari/undercoat/standard/black_pink
name = "black and pink undercoat"
icon_state = "tesh_uniform_bpi"
item_state = "tesh_uniform_bpi"
/obj/item/clothing/under/teshari/undercoat/standard/black_brown
name = "black and brown undercoat"
icon_state = "tesh_uniform_bbr"
item_state = "tesh_uniform_bbr"
/obj/item/clothing/under/teshari/undercoat/standard/orange_grey
name = "orange and grey undercoat"
icon_state = "tesh_uniform_og"
item_state = "tesh_uniform_og"
/obj/item/clothing/under/teshari/undercoat/standard/rainbow
name = "rainbow undercoat"
icon_state = "tesh_uniform_rainbow"
item_state = "tesh_uniform_rainbow"
/obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey
name = "light grey and grey undercoat"
icon_state = "tesh_uniform_lgg"
item_state = "tesh_uniform_lgg"
/obj/item/clothing/under/teshari/undercoat/standard/white_grey
name = "white and grey undercoat"
icon_state = "tesh_uniform_wg"
item_state = "tesh_uniform_wg"
/obj/item/clothing/under/teshari/undercoat/standard/red_grey
name = "red and grey undercoat"
icon_state = "tesh_uniform_rg"
item_state = "tesh_uniform_rg"
/obj/item/clothing/under/teshari/undercoat/standard/orange
name = "orange undercoat"
icon_state = "tesh_uniform_on"
item_state = "tesh_uniform_on"
/obj/item/clothing/under/teshari/undercoat/standard/yellow_grey
name = "yellow and grey undercoat"
icon_state = "tesh_uniform_yg"
item_state = "tesh_uniform_yg"
/obj/item/clothing/under/teshari/undercoat/standard/green_grey
name = "green and grey undercoat"
icon_state = "tesh_uniform_gg"
item_state = "tesh_uniform_gg"
/obj/item/clothing/under/teshari/undercoat/standard/blue_grey
name = "blue and grey undercoat"
icon_state = "tesh_uniform_blug"
item_state = "tesh_uniform_blug"
/obj/item/clothing/under/teshari/undercoat/standard/purple_grey
name = "purple and grey undercoat"
icon_state = "tesh_uniform_pg"
item_state = "tesh_uniform_pg"
/obj/item/clothing/under/teshari/undercoat/standard/pink_grey
name = "pink and grey undercoat"
icon_state = "tesh_uniform_pig"
item_state = "tesh_uniform_pig"
/obj/item/clothing/under/teshari/undercoat/standard/brown_grey
name = "brown and grey undercoat"
icon_state = "tesh_uniform_brg"
item_state = "tesh_uniform_brg"
//Job Undercoats
/obj/item/clothing/under/teshari/undercoat/jobs/cap
name = "facility director undercoat"
desc = "A traditional Teshari garb made for the Facility Director"
icon_state = "tesh_uniform_cap"
item_state = "tesh_uniform_cap"
/obj/item/clothing/under/teshari/undercoat/jobs/hop
name = "head of personnel undercoat"
desc = "A traditional Teshari garb made for the Head of Personnel"
icon_state = "tesh_uniform_hop"
item_state = "tesh_uniform_hop"
/obj/item/clothing/under/teshari/undercoat/jobs/ce
name = "cheif engineer undercoat"
desc = "A traditional Teshari garb made for the Chief Engineer"
icon_state = "tesh_uniform_ce"
item_state = "tesh_uniform_ce"
/obj/item/clothing/under/teshari/undercoat/jobs/hos
name = "head of security undercoat"
desc = "A traditional Teshari garb made for the Head of Security"
icon_state = "tesh_uniform_hos"
item_state = "tesh_uniform_hos"
/obj/item/clothing/under/teshari/undercoat/jobs/rd
name = "research director undercoat"
desc = "A traditional Teshari garb made for the Research Director"
icon_state = "tesh_uniform_rd"
item_state = "tesh_uniform_rd"
/obj/item/clothing/under/teshari/undercoat/jobs/engineer
name = "engineering undercoat"
desc = "A traditional Teshari garb made for the Engineering department"
icon_state = "tesh_uniform_engie"
item_state = "tesh_uniform_engie"
/obj/item/clothing/under/teshari/undercoat/jobs/atmos
name = "atmospherics undercoat"
desc = "A traditional Teshari garb made for the Atmospheric Technician"
icon_state = "tesh_uniform_atmos"
item_state = "tesh_uniform_atmos"
/obj/item/clothing/under/teshari/undercoat/jobs/cmo
name = "chief medical officer undercoat"
desc = "A traditional Teshari garb made for the Cheif Medical Officer"
icon_state = "tesh_uniform_cmo"
item_state = "tesh_uniform_cmo"
/obj/item/clothing/under/teshari/undercoat/jobs/qm
name = "quartermaster undercoat"
desc = "A traditional Teshari garb made for the Quartermaster"
icon_state = "tesh_uniform_qm"
item_state = "tesh_uniform_qm"
/obj/item/clothing/under/teshari/undercoat/jobs/cargo
name = "cargo undercoat"
desc = "A traditional Teshari garb made for the Cargo department"
icon_state = "tesh_uniform_car"
item_state = "tesh_uniform_car"
/obj/item/clothing/under/teshari/undercoat/jobs/mining
name = "mining undercoat"
desc = "A traditional Teshari garb made for Mining"
icon_state = "tesh_uniform_mine"
item_state = "tesh_uniform_mine"
/obj/item/clothing/under/teshari/undercoat/jobs/medical
name = "medical undercoat"
desc = "A traditional Teshari garb made for the Medical department"
icon_state = "tesh_uniform_doc"
item_state = "tesh_uniform_doc"
/obj/item/clothing/under/teshari/undercoat/jobs/chemistry
name = "chemist undercoat"
desc = "A traditional Teshari garb made for the Chemist"
icon_state = "tesh_uniform_chem"
item_state = "tesh_uniform_chem"
/obj/item/clothing/under/teshari/undercoat/jobs/viro
name = "virologist undercoat"
desc = "A traditional Teshari garb made for the Virologist"
icon_state = "tesh_uniform_viro"
item_state = "tesh_uniform_viro"
/obj/item/clothing/under/teshari/undercoat/jobs/psych
name = "psychiatrist undercoat"
desc = "A traditional Teshari garb made for the Psychiatrist"
icon_state = "tesh_uniform_psych"
item_state = "tesh_uniform_psych"
/obj/item/clothing/under/teshari/undercoat/jobs/para
name = "paramedic undercoat"
desc = "A traditional Teshari garb made for the Paramedic"
icon_state = "tesh_uniform_para"
item_state = "tesh_uniform_para"
/obj/item/clothing/under/teshari/undercoat/jobs/sci
name = "scientist undercoat"
desc = "A traditional Teshari garb made for the Science department"
icon_state = "tesh_uniform_sci"
item_state = "tesh_uniform_sci"
/obj/item/clothing/under/teshari/undercoat/jobs/robo
name = "roboticist undercoat"
desc = "A traditional Teshari garb made for the Roboticist"
icon_state = "tesh_uniform_robo"
item_state = "tesh_uniform_robo"
/obj/item/clothing/under/teshari/undercoat/jobs/sec
name = "security undercoat"
desc = "A traditional Teshari garb made for the Security department"
icon_state = "tesh_uniform_sec"
item_state = "tesh_uniform_sec"
/obj/item/clothing/under/teshari/undercoat/jobs/service
name = "service undercoat"
desc = "A traditional Teshari garb made for the Service department"
icon_state = "tesh_uniform_serv"
item_state = "tesh_uniform_serv"
/obj/item/clothing/under/teshari/undercoat/jobs/iaa
name = "internal affairs undercoat"
desc = "A traditional Teshari garb made for the Internal Affairs Agent"
icon_state = "tesh_uniform_iaa"
item_state = "tesh_uniform_iaa"
code/modules/mob/living/carbon/human/human_species.dm
+5 -1
View File
@@ -84,7 +84,11 @@
h_style = "vulpkanin, dual-color"
return ..(new_loc, SPECIES_VULPKANIN)
/mob/living/carbon/human/dummy/mannequin/autoequip/teshari
icon = 'icons/mob/human_races/r_teshari.dmi'
/mob/living/carbon/human/dummy/mannequin/autoequip/teshari/Initialize(var/new_loc)
//h_style = "teshari, dual-color"
return ..(new_loc, SPECIES_TESHARI)
/mob/living/carbon/human/skrell/Initialize(var/new_loc)
h_style = "Skrell Short Tentacles"