diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index 42fb58e6625..3912bc6c6b8 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -13,7 +13,7 @@ TECH_COMBAT = 7, TECH_MAGNET = 9, TECH_DATA = 5 ) sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/back.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' ) var/energy = 10000 var/max_energy = 10000 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 21b74636374..7c64f1b2038 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -8,7 +8,7 @@ subspace_transmission = 1 canhear_range = 0 // can't hear headsets from very far away slot_flags = SLOT_EARS - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi') var/translate_binary = 0 var/translate_hive = 0 diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 924d753c28f..0f7405096dc 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -19,7 +19,7 @@ var/cuff_sound = 'sound/weapons/handcuffs.ogg' var/cuff_type = "handcuffs" var/use_time = 30 - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/handcuffs.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi') /obj/item/weapon/handcuffs/get_worn_icon_state(var/slot_name) if(slot_name == slot_handcuffed_str) @@ -214,7 +214,7 @@ var/last_chew = 0 origin_tech = list(TECH_MATERIAL = 1) breakouttime = 300 //Deciseconds = 30s = 0.5 minute cuff_type = "legcuffs" - sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi') elastic = 0 cuff_sound = 'sound/weapons/handcuffs.ogg' //This shold work for now. diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 4f21a737c8e..5a8fe7448de 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -5,7 +5,7 @@ item_state = "card-id" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/id.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/id.dmi' ) var/access = list() diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 5741387b7ba..8660d8a6734 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/clothing/backpack.dmi' icon_state = "backpack" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' ) w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index c3dba166bc4..5dc7f83da8b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -11,7 +11,7 @@ equip_sound = 'sound/items/toolbelt_equip.ogg' drop_sound = 'sound/items/drop/toolbelt.ogg' pickup_sound = 'sound/items/pickup/toolbelt.ogg' - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi') var/show_above_suit = 0 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index f6045c6174d..806d26c90b6 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -8,7 +8,7 @@ var/list/global/tank_gauge_cache = list() name = "tank" icon = 'icons/obj/tank.dmi' sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' ) drop_sound = 'sound/items/drop/gascan.ogg' pickup_sound = 'sound/items/pickup/gascan.ogg' diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index 2b41ce51637..77e1c43960a 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -15,11 +15,11 @@ ..() switch(slot) if(slot_head) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi') if(slot_wear_suit) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi') if(slot_belt) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi') /obj/item/weapon/towel/attack_self(mob/living/user as mob) user.visible_message(text("[] uses [] to towel themselves off.", user, src)) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index a04feb1d6b5..c4c9fe564e8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -94,43 +94,43 @@ /datum/gear/uniform/smock display_name = "smock selection (Teshari)" - path = /obj/item/clothing/under/seromi/smock + path = /obj/item/clothing/under/teshari/smock whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/uniform/smock/New() ..() var/list/smocks = list() - for(var/smock in typesof(/obj/item/clothing/under/seromi/smock)) - var/obj/item/clothing/under/seromi/smock/smock_type = smock + for(var/smock in typesof(/obj/item/clothing/under/teshari/smock)) + var/obj/item/clothing/under/teshari/smock/smock_type = smock smocks[initial(smock_type.name)] = smock_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(smocks)) /datum/gear/uniform/undercoat display_name = "undercoat selection (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/standard + path = /obj/item/clothing/under/teshari/undercoat/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/uniform/undercoat/New() ..() var/list/undercoats = list() - for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat/standard)) - var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat + for(var/undercoat in typesof(/obj/item/clothing/under/teshari/undercoat/standard)) + var/obj/item/clothing/under/teshari/undercoat/standard/undercoat_type = undercoat undercoats[initial(undercoat_type.name)] = undercoat_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) /datum/gear/suit/cloak display_name = "cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/standard + path = /obj/item/clothing/suit/storage/teshari/cloak/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/suit/cloak/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/standard)) - var/obj/item/clothing/suit/storage/seromi/cloak/standard/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/standard)) + var/obj/item/clothing/suit/storage/teshari/cloak/standard/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) @@ -168,107 +168,107 @@ /datum/gear/uniform/dept/undercoat/cap display_name = "facility director undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/cap + path = /obj/item/clothing/under/teshari/undercoat/jobs/cap allowed_roles = list("Facility Director") /datum/gear/uniform/dept/undercoat/hop display_name = "head of personnel undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/hop + path = /obj/item/clothing/under/teshari/undercoat/jobs/hop allowed_roles = list("Head of Personnel") /datum/gear/uniform/dept/undercoat/rd display_name = "research director undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/rd + path = /obj/item/clothing/under/teshari/undercoat/jobs/rd allowed_roles = list("Research Director") /datum/gear/uniform/dept/undercoat/hos display_name = "head of security undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/hos + path = /obj/item/clothing/under/teshari/undercoat/jobs/hos allowed_roles = list("Head of Security") /datum/gear/uniform/dept/undercoat/ce display_name = "chief engineer undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/ce + path = /obj/item/clothing/under/teshari/undercoat/jobs/ce allowed_roles = list("Chief Engineer") /datum/gear/uniform/dept/undercoat/cmo display_name = "chief medical officer undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/cmo + path = /obj/item/clothing/under/teshari/undercoat/jobs/cmo allowed_roles = list("Chief Medical Officer") /datum/gear/uniform/dept/undercoat/qm display_name = "quartermaster undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/qm + path = /obj/item/clothing/under/teshari/undercoat/jobs/qm allowed_roles = list("Quartermaster") /datum/gear/uniform/dept/undercoat/cargo display_name = "cargo undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/cargo + path = /obj/item/clothing/under/teshari/undercoat/jobs/cargo allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner") /datum/gear/uniform/dept/undercoat/mining display_name = "mining undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/mining + path = /obj/item/clothing/under/teshari/undercoat/jobs/mining allowed_roles = list("Quartermaster","Shaft Miner") /datum/gear/uniform/dept/undercoat/security display_name = "security undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/sec + path = /obj/item/clothing/under/teshari/undercoat/jobs/sec allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) /datum/gear/uniform/dept/undercoat/service display_name = "service undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/service + path = /obj/item/clothing/under/teshari/undercoat/jobs/service allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/engineer + path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer allowed_roles = list("Chief Engineer","Station Engineer") /datum/gear/uniform/dept/undercoat/atmos display_name = "atmospherics undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/atmos + path = /obj/item/clothing/under/teshari/undercoat/jobs/atmos allowed_roles = list("Chief Engineer","Atmospheric Technician") /datum/gear/uniform/dept/undercoat/research display_name = "scientist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/sci + path = /obj/item/clothing/under/teshari/undercoat/jobs/sci allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/dept/undercoat/robo display_name = "roboticist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/robo + path = /obj/item/clothing/under/teshari/undercoat/jobs/robo allowed_roles = list("Research Director","Roboticist") /datum/gear/uniform/dept/undercoat/medical display_name = "medical undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/medical + path = /obj/item/clothing/under/teshari/undercoat/jobs/medical allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist") /datum/gear/uniform/dept/undercoat/chemistry display_name = "chemist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/chemistry + path = /obj/item/clothing/under/teshari/undercoat/jobs/chemistry allowed_roles = list("Chief Medical Officer","Chemist") /datum/gear/uniform/dept/undercoat/virology display_name = "virologist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/viro + path = /obj/item/clothing/under/teshari/undercoat/jobs/viro allowed_roles = list("Chief Medical Officer","Medical Doctor") /datum/gear/uniform/dept/undercoat/psych display_name = "psychiatrist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/psych + path = /obj/item/clothing/under/teshari/undercoat/jobs/psych allowed_roles = list("Chief Medical Officer","Psychiatrist") /datum/gear/uniform/dept/undercoat/paramedic display_name = "paramedic undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/para + path = /obj/item/clothing/under/teshari/undercoat/jobs/para allowed_roles = list("Chief Medical Officer","Paramedic") /datum/gear/uniform/dept/undercoat/iaa display_name = "internal affairs undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/iaa + path = /obj/item/clothing/under/teshari/undercoat/jobs/iaa allowed_roles = list("Internal Affairs Agent") /datum/gear/suit/dept/cloak @@ -277,248 +277,248 @@ /datum/gear/suit/dept/cloak/cap display_name = "facility director cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs allowed_roles = list("Facility Director") /datum/gear/suit/dept/cloak/hop display_name = "head of personnel cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hop + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hop allowed_roles = list("Head of Personnel") /datum/gear/suit/dept/cloak/rd display_name = "research director cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/rd + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/rd allowed_roles = list("Research Director") /datum/gear/suit/dept/cloak/hos display_name = "head of security cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hos + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hos allowed_roles = list("Head of Security") /datum/gear/suit/dept/cloak/hos/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/hos)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/hos,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/hos)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/cloak/dept/ce display_name = "chief engineer cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/ce + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/ce allowed_roles = list("Chief Engineer") /datum/gear/suit/dept/cloak/ce/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/ce,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/ce)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/cmo display_name = "chief medical officer cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo allowed_roles = list("Chief Medical Officer") /datum/gear/suit/dept/cloak/cmo/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cmo)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/qm display_name = "quartermaster cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/qm allowed_roles = list("Chief Medical Officer") /datum/gear/suit/dept/cloak/qm/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/qm,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/qm)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/cargo display_name = "cargo cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician") /datum/gear/suit/dept/cloak/cargo/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cargo)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/mining display_name = "mining cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/mining + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/mining allowed_roles = list("Quartermaster","Shaft Miner") /datum/gear/suit/dept/cloak/mining/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/mining,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/mining)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/security display_name = "security cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sec allowed_roles = list("Head of Security","Detective","Warden","Security Officer") /datum/gear/suit/dept/cloak/security/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/sec,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sec)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/service display_name = "service cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/service + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/service allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") /datum/gear/suit/dept/cloak/service/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/service,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/service,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/service)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/engineer display_name = "engineering cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer allowed_roles = list("Chief Engineer","Station Engineer") /datum/gear/suit/dept/cloak/engineer/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/engineer)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/engineer)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/atmos display_name = "atmospherics cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos allowed_roles = list("Chief Engineer","Atmospheric Technician") /datum/gear/suit/dept/cloak/atmos/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/atmos)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/research display_name = "scientist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sci + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sci allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist") /datum/gear/suit/dept/cloak/research/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/sci,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sci)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/robo display_name = "roboticist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/robo + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/robo allowed_roles = list("Research Director","Roboticist") /datum/gear/suit/dept/cloak/robo/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/robo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/robo)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/medical display_name = "medical cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/medical + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/medical allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/dept/cloak/medical/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/medical,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/medical)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/chemistry display_name = "chemist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry allowed_roles = list("Chemist") /datum/gear/suit/dept/cloak/chemistry/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/chemistry)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/virology display_name = "virologist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/viro + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/viro allowed_roles = list("Medical Doctor") /datum/gear/suit/dept/cloak/virology/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/viro,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/viro)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/psych display_name = "psychiatrist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/psych + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/psych allowed_roles = list("Chief Medical Officer","Psychiatrist") /datum/gear/suit/dept/cloak/paramedic display_name = "paramedic cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/para + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/para allowed_roles = list("Chief Medical Officer","Paramedic") /datum/gear/suit/dept/cloak/paramedic/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/para,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/para,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/para)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/iaa display_name = "internal affairs cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa allowed_roles = list("Internal Affairs Agent") /datum/gear/suit/dept/cloak/iaa/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/iaa)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/uniform/smockcolor display_name = "smock, recolorable (Teshari)" - path = /obj/item/clothing/under/seromi/smock/white + path = /obj/item/clothing/under/teshari/smock/white whitelisted = SPECIES_TESHARI sort_category = "Xenowear" @@ -528,21 +528,21 @@ /datum/gear/suit/beltcloak display_name = "belted cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard + path = /obj/item/clothing/suit/storage/teshari/beltcloak/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/suit/beltcloak/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/standard)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/standard/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/beltcloak/standard)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/standard/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/beltcloak_color display_name = "belted cloak, recolorable (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey + path = /obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey whitelisted = SPECIES_TESHARI sort_category = "Xenowear" @@ -552,17 +552,17 @@ /datum/gear/suit/dept/beltcloak/wrdn display_name = "warden belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn + path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn allowed_roles = list("Head of Security","Warden") /datum/gear/suit/dept/beltcloak/jani display_name = "janitor belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani + path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani allowed_roles = list("Janitor") /datum/gear/suit/dept/beltcloak/cmd display_name = "command belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command + path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director") /datum/gear/suit/cloak_hood @@ -575,27 +575,27 @@ ..() var/list/cloaks = list() for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard)) - var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + var/obj/item/clothing/suit/storage/teshari/cloak/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/uniform/worksuit display_name = "worksuit selection (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/standard/worksuit + path = /obj/item/clothing/under/teshari/undercoat/standard/worksuit whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/uniform/worksuit/New() ..() var/list/worksuits = list() - for(var/worksuit in typesof(/obj/item/clothing/under/seromi/undercoat/standard/worksuit)) - var/obj/item/clothing/under/seromi/undercoat/standard/worksuit/worksuit_type = worksuit + for(var/worksuit in typesof(/obj/item/clothing/under/teshari/undercoat/standard/worksuit)) + var/obj/item/clothing/under/teshari/undercoat/standard/worksuit/worksuit_type = worksuit worksuits[initial(worksuit_type.name)] = worksuit_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(worksuits)) /datum/gear/uniform/undercoatcolor display_name = "undercoat, recolorable (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/standard/white_grey + path = /obj/item/clothing/under/teshari/undercoat/standard/white_grey whitelisted = SPECIES_TESHARI sort_category = "Xenowear" @@ -605,7 +605,7 @@ /datum/gear/suit/cloakcolor display_name = "cloak, recolorable (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey + path = /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey whitelisted = SPECIES_TESHARI sort_category = "Xenowear" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index eea01d31b8c..de9bb813a77 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -229,7 +229,7 @@ throwforce = 2 slot_flags = SLOT_EARS sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi') + SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi') /obj/item/clothing/ears/attack_hand(mob/user as mob) if (!user) return @@ -328,7 +328,7 @@ slot_flags = SLOT_GLOVES attack_verb = list("challenged") sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/gloves.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi', SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi' ) drop_sound = 'sound/items/drop/gloves.ogg' @@ -470,7 +470,7 @@ var/image/helmet_light sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi' ) drop_sound = 'sound/items/drop/hat.ogg' @@ -576,7 +576,7 @@ body_parts_covered = FACE|EYES blood_sprite_state = "maskblood" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/masks.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/masks.dmi', SPECIES_VOX = 'icons/mob/species/vox/masks.dmi', SPECIES_TAJ = 'icons/mob/species/tajaran/mask.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/mask.dmi' @@ -630,7 +630,7 @@ var/overshoes = 0 species_restricted = list("exclude",SPECIES_TESHARI, SPECIES_VOX) sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/shoes.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi', SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi' ) drop_sound = 'sound/items/drop/shoes.ogg' @@ -753,7 +753,7 @@ sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi' ) @@ -847,7 +847,7 @@ var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/uniform.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi', SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi' ) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 60ff3b8e352..49cf22bd9b6 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -31,8 +31,8 @@ BLIND // can't see anything pickup_sound = 'sound/items/pickup/accessory.ogg' sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/eyes.dmi', - "Vox" = 'icons/mob/species/vox/eyes.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi', + SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/update_clothing_icon() diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 79642d34c14..4b410163fe2 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -10,7 +10,7 @@ desc = "an ultra rare hat. It commands a certain respect." icon_state = "petehat" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi' ) diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index 135c73d5396..519f7cd1a79 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -6,7 +6,7 @@ icon_state = "pilot_helmet1" item_icons = list(slot_head_str = 'icons/mob/pilot_helmet.dmi') sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/pilot_helmet.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/pilot_helmet.dmi' ) flags = THICKMATERIAL armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0) diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 8ae8ca36741..cc76771d459 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -15,7 +15,7 @@ SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' ) species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them max_pressure_protection = null @@ -57,7 +57,7 @@ SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' ) supporting_limbs = list() species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 7b4be66f222..7b4cf74057d 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -186,7 +186,7 @@ /obj/item/clothing/head/helmet/space/void/medical/alt/tesh sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' ) sprite_sheets_obj = list( SPECIES_TESHARI = 'icons/obj/clothing/hats.dmi' @@ -222,7 +222,7 @@ /obj/item/clothing/suit/space/void/medical/alt/tesh sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' ) sprite_sheets_obj = list( SPECIES_TESHARI = 'icons/obj/clothing/spacesuits.dmi' diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index d92b1351eee..88ccc7370e3 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -24,7 +24,7 @@ SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi', SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi', SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/hats.dmi' + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/hats.dmi' ) light_overlay = "helmet_light" @@ -54,7 +54,7 @@ SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi', SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi', SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/suits.dmi' + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/suits.dmi' ) //Breach thresholds, should ideally be inherited by most (if not all) voidsuits. diff --git a/code/modules/clothing/suits/aliens/seromi.dm b/code/modules/clothing/suits/aliens/teshari.dm similarity index 77% rename from code/modules/clothing/suits/aliens/seromi.dm rename to code/modules/clothing/suits/aliens/teshari.dm index 4ce78dff7b2..65a19bf8c20 100644 --- a/code/modules/clothing/suits/aliens/seromi.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -1,141 +1,141 @@ // Standard Cloaks -/obj/item/clothing/suit/storage/seromi/cloak +/obj/item/clothing/suit/storage/teshari/cloak name = "black cloak" desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside." - icon = 'icons/mob/species/seromi/teshari_cloak.dmi' - icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi' + icon = 'icons/mob/species/teshari/teshari_cloak.dmi' + icon_override = 'icons/mob/species/teshari/teshari_cloak.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/seromi/cloak/standard/black_red +/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/seromi/cloak/standard/black_orange +/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/seromi/cloak/standard/black_yellow +/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/seromi/cloak/standard/black_green +/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/seromi/cloak/standard/black_blue +/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/seromi/cloak/standard/black_purple +/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/seromi/cloak/standard/black_pink +/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/seromi/cloak/standard/black_brown +/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/seromi/cloak/standard/black_grey +/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/seromi/cloak/standard/black_white +/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/seromi/cloak/standard/white +/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/seromi/cloak/standard/white_grey +/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/seromi/cloak/standard/red_grey +/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/seromi/cloak/standard/orange_grey +/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/seromi/cloak/standard/yellow_grey +/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/seromi/cloak/standard/green_grey +/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/seromi/cloak/standard/blue_grey +/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/seromi/cloak/standard/purple_grey +/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/seromi/cloak/standard/pink_grey +/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/seromi/cloak/standard/brown_grey +/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/seromi/cloak/standard/rainbow +/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/seromi/cloak/standard/orange +/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/seromi/cloak/standard/dark_retrowave +/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/seromi/cloak/standard/black_glow +/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 -/obj/item/clothing/suit/storage/seromi/cloak/jobs - icon = 'icons/mob/species/seromi/deptcloak.dmi' - icon_override = 'icons/mob/species/seromi/deptcloak.dmi' +/obj/item/clothing/suit/storage/teshari/cloak/jobs + icon = 'icons/mob/species/teshari/deptcloak.dmi' + icon_override = 'icons/mob/species/teshari/deptcloak.dmi' -/obj/item/clothing/suit/storage/seromi/cloak/jobs/cap +/obj/item/clothing/suit/storage/teshari/cloak/jobs/cap name = "facility director cloak" desc = "A soft Teshari cloak made for the Facility Director" icon_state = "tesh_cloak_cap" @@ -143,19 +143,19 @@ //Cargo -/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm +/obj/item/clothing/suit/storage/teshari/cloak/jobs/qm 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/seromi/cloak/jobs/cargo +/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/seromi/cloak/jobs/mining +/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" @@ -163,19 +163,19 @@ //Engineering -/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce +/obj/item/clothing/suit/storage/teshari/cloak/jobs/ce 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/seromi/cloak/jobs/engineer +/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/seromi/cloak/jobs/atmos +/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" @@ -183,37 +183,37 @@ //Medical -/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo +/obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo 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/seromi/cloak/jobs/medical +/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/seromi/cloak/jobs/chemistry +/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/seromi/cloak/jobs/viro +/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/seromi/cloak/jobs/para +/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/seromi/cloak/jobs/psych +/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" @@ -221,19 +221,19 @@ //Science -/obj/item/clothing/suit/storage/seromi/cloak/jobs/rd +/obj/item/clothing/suit/storage/teshari/cloak/jobs/rd 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/seromi/cloak/jobs/sci +/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/seromi/cloak/jobs/robo +/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" @@ -241,19 +241,19 @@ //Security -/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos +/obj/item/clothing/suit/storage/teshari/cloak/jobs/hos 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/seromi/cloak/jobs/sec +/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/seromi/cloak/jobs/iaa +/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" @@ -261,13 +261,13 @@ //Service -/obj/item/clothing/suit/storage/seromi/cloak/jobs/hop +/obj/item/clothing/suit/storage/teshari/cloak/jobs/hop 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/seromi/cloak/jobs/service +/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" @@ -278,16 +278,16 @@ /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/obj/clothing/species/seromi/suits.dmi' - icon_override = 'icons/mob/species/seromi/suit.dmi' + icon = 'icons/obj/clothing/species/teshari/suits.dmi' + icon_override = 'icons/mob/species/teshari/suit.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/obj/clothing/species/seromi/suits.dmi' - icon_override = 'icons/mob/species/seromi/suit.dmi' + icon = 'icons/obj/clothing/species/teshari/suits.dmi' + icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesharicoat" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS species_restricted = list(SPECIES_TESHARI) @@ -295,8 +295,8 @@ /obj/item/clothing/suit/storage/toggle/tesharicoatwhite name = "small coat" desc = "A coat that seems too small to fit a human." - icon = 'icons/obj/clothing/species/seromi/suits.dmi' - icon_override = 'icons/mob/species/seromi/suit.dmi' + icon = 'icons/obj/clothing/species/teshari/suits.dmi' + icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesharicoatwhite" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS species_restricted = list(SPECIES_TESHARI) @@ -305,8 +305,8 @@ /obj/item/clothing/suit/storage/hooded/teshari name = "Hooded Teshari Cloak" desc = "A soft teshari cloak with an added hood." - icon_override = 'icons/mob/species/seromi/teshari_hood.dmi' - icon = 'icons/mob/species/seromi/teshari_hood.dmi' + icon_override = 'icons/mob/species/teshari/teshari_hood.dmi' + icon = 'icons/mob/species/teshari/teshari_hood.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 @@ -319,8 +319,8 @@ /obj/item/clothing/head/tesh_hood name = "Cloak Hood" desc = "A hood attached to a teshari cloak." - icon_override = 'icons/mob/species/seromi/teshari_hood.dmi' - icon = 'icons/mob/species/seromi/teshari_hood.dmi' + icon_override = 'icons/mob/species/teshari/teshari_hood.dmi' + icon = 'icons/mob/species/teshari/teshari_hood.dmi' icon_state = "tesh_hood_bo" item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo") flags_inv = BLOCKHAIR @@ -603,261 +603,261 @@ item_state = "tesh_hood_brg" //Belted cloaks -/obj/item/clothing/suit/storage/seromi/beltcloak +/obj/item/clothing/suit/storage/teshari/beltcloak name = "belted cloak" desc = "A more ridged and stylized Teshari cloak." - icon = 'icons/mob/species/seromi/teshari_cloak.dmi' - icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi' + icon = 'icons/mob/species/teshari/teshari_cloak.dmi' + icon_override = 'icons/mob/species/teshari/teshari_cloak.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/seromi/beltcloak/standard/black_orange +/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/seromi/beltcloak/standard/black_grey +/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/seromi/beltcloak/standard/black_midgrey +/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/seromi/beltcloak/standard/black_lightgrey +/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/seromi/beltcloak/standard/black_white +/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/seromi/beltcloak/standard/black_red +/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/seromi/beltcloak/standard/black +/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/seromi/beltcloak/standard/black_yellow +/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/seromi/beltcloak/standard/black_green +/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/seromi/beltcloak/standard/black_blue +/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/seromi/beltcloak/standard/black_purple +/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/seromi/beltcloak/standard/black_pink +/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/seromi/beltcloak/standard/black_brown +/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/seromi/beltcloak/standard/orange_grey +/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/seromi/beltcloak/standard/rainbow +/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/seromi/beltcloak/standard/lightgrey_grey +/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/seromi/beltcloak/standard/white_grey +/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/seromi/beltcloak/standard/red_grey +/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/seromi/beltcloak/standard/orange +/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/seromi/beltcloak/standard/yellow_grey +/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/seromi/beltcloak/standard/green_grey +/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/seromi/beltcloak/standard/blue_grey +/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/seromi/beltcloak/standard/purple_grey +/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/seromi/beltcloak/standard/pink_grey +/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/seromi/beltcloak/standard/brown_grey +/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/seromi/beltcloak/jobs - icon = 'icons/mob/species/seromi/deptcloak.dmi' - icon_override = 'icons/mob/species/seromi/deptcloak.dmi' +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs + icon = 'icons/mob/species/teshari/deptcloak.dmi' + icon_override = 'icons/mob/species/teshari/deptcloak.dmi' -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo +/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/seromi/beltcloak/jobs/mining +/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/seromi/beltcloak/jobs/command +/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/seromi/beltcloak/jobs/ce +/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/seromi/beltcloak/jobs/engineer +/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/seromi/beltcloak/jobs/atmos +/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/seromi/beltcloak/jobs/cmo +/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/seromi/beltcloak/jobs/medical +/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/seromi/beltcloak/jobs/chemistry +/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" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro +/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/seromi/beltcloak/jobs/para +/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/seromi/beltcloak/jobs/sci +/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/seromi/beltcloak/jobs/robo +/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/seromi/beltcloak/jobs/sec +/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/seromi/beltcloak/jobs/qm +/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/seromi/beltcloak/jobs/service +/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/seromi/beltcloak/jobs/iaa +/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/seromi/beltcloak/jobs/wrdn +/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/seromi/beltcloak/jobs/hos +/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/seromi/beltcloak/jobs/jani +/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" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 39f23ef5e6e..e576016aa7c 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -15,7 +15,7 @@ var/concealed_holster = 0 var/mob/living/carbon/human/wearer = null // To check if the wearer changes, so species spritesheets change properly. var/list/on_rolled = list() // Used when jumpsuit sleevels are rolled ("rolled" entry) or it's rolled down ("down"). Set to "none" to hide in those states. - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/ties.dmi') //Teshari can into webbing, too! + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi') //Teshari can into webbing, too! drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index e34928641aa..04baf0a2695 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -57,17 +57,16 @@ siemens_coefficient = 0.9 w_class = ITEMSIZE_NORMAL slot = ACCESSORY_SLOT_OVER - sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/suit.dmi' - ) + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' + ) /obj/item/clothing/accessory/poncho/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites. ..() var/mob/living/carbon/human/H = loc if(istype(H) && H.wear_suit == src) - if(H.species.name == "Teshari") - icon_override = 'icons/mob/species/seromi/suit.dmi' + if(H.species.name == SPECIES_TESHARI) + icon_override = 'icons/mob/species/teshari/suit.dmi' else icon_override = 'icons/mob/ties.dmi' update_clothing_icon() diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/teshari.dm similarity index 66% rename from code/modules/clothing/under/xenos/seromi.dm rename to code/modules/clothing/under/xenos/teshari.dm index 0593f78f72f..39c3590bf4e 100644 --- a/code/modules/clothing/under/xenos/seromi.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -1,387 +1,387 @@ -/obj/item/clothing/under/seromi - icon = 'icons/obj/clothing/species/seromi/uniform.dmi' +/obj/item/clothing/under/teshari + icon = 'icons/obj/clothing/species/teshari/uniform.dmi' icon_state = "seromi_grey" species_restricted = list(SPECIES_TESHARI) -/obj/item/clothing/under/seromi/smock +/obj/item/clothing/under/teshari/smock name = "small grey smock" desc = "It looks fitted to nonhuman proportions." icon_state = "seromi_grey" body_parts_covered = 0 // It's a thin piece of cloth with a neck hole. -/obj/item/clothing/under/seromi/smock/white +/obj/item/clothing/under/teshari/smock/white name = "small white smock" icon_state = "seromi_white" -/obj/item/clothing/under/seromi/smock/red +/obj/item/clothing/under/teshari/smock/red name = "small Security smock" icon_state = "seromi_red" -/obj/item/clothing/under/seromi/smock/yellow +/obj/item/clothing/under/teshari/smock/yellow name = "small Engineering smock" icon_state = "seromi_yellow" -/obj/item/clothing/under/seromi/smock/medical +/obj/item/clothing/under/teshari/smock/medical name = "small Medical uniform" icon_state = "seromi_medical" -/obj/item/clothing/under/seromi/smock/science +/obj/item/clothing/under/teshari/smock/science name = "small Research uniform" icon_state = "teshari_science" -/obj/item/clothing/under/seromi/smock/rainbow +/obj/item/clothing/under/teshari/smock/rainbow name = "small rainbow smock" icon_state = "seromi_rainbow" -/obj/item/clothing/under/seromi/smock/dress +/obj/item/clothing/under/teshari/smock/dress name = "small command dress" icon_state = "seromi_dress_cap" -/obj/item/clothing/under/seromi/smock/dress/science +/obj/item/clothing/under/teshari/smock/dress/science name = "small research dress" icon_state = "tesh_dress_science" -/obj/item/clothing/under/seromi/smock/dress/security +/obj/item/clothing/under/teshari/smock/dress/security name = "small security dress" icon_state = "tesh_dress_security" -/obj/item/clothing/under/seromi/smock/dress/engine +/obj/item/clothing/under/teshari/smock/dress/engine name = "small engineering dress" icon_state = "tesh_dress_engine" -/obj/item/clothing/under/seromi/smock/dress/medical +/obj/item/clothing/under/teshari/smock/dress/medical name = "small medical dress" icon_state = "tesh_dress_medical" -/obj/item/clothing/under/seromi/smock/uniform +/obj/item/clothing/under/teshari/smock/uniform name = "small command uniform" icon_state = "seromi_captain" -/obj/item/clothing/under/seromi/smock/formal +/obj/item/clothing/under/teshari/smock/formal name = "small formal uniform" icon_state = "seromi_captain_formal" -/obj/item/clothing/under/seromi/smock/blackutilitysmock +/obj/item/clothing/under/teshari/smock/blackutilitysmock name = "black utility smock" icon_state = "teshari_blackutility_com" -/obj/item/clothing/under/seromi/smock/greydress +/obj/item/clothing/under/teshari/smock/greydress name = "small grey dress" icon_state = "teshari_greydress" -/obj/item/clothing/under/seromi/smock/blackutility +/obj/item/clothing/under/teshari/smock/blackutility name = "Teshari utility uniform" icon_state = "teshari_blackutility" -/obj/item/clothing/under/seromi/smock/bluegreydress +/obj/item/clothing/under/teshari/smock/bluegreydress name = "small blue and grey dress" icon_state = "teshari_bluegreydress" // Worksuits -/obj/item/clothing/under/seromi/undercoat/standard/worksuit +/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/seromi/undercoat/standard/worksuit/blackpurple +/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/seromi/undercoat/standard/worksuit/blackorange +/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/seromi/undercoat/standard/worksuit/blackblue +/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/seromi/undercoat/standard/worksuit/blackgreen +/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/seromi/undercoat/standard/worksuit/whitered +/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/seromi/undercoat/standard/worksuit/whitepurple +/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/seromi/undercoat/standard/worksuit/whiteorange +/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/seromi/undercoat/standard/worksuit/whiteblue +/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/seromi/undercoat/standard/worksuit/whitegreen +/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 -/obj/item/clothing/under/seromi/undercoat +/obj/item/clothing/under/teshari/undercoat 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 = 'icons/mob/species/seromi/teshari_uniform.dmi' - icon_override = 'icons/mob/species/seromi/teshari_uniform.dmi' + icon = 'icons/mob/species/teshari/teshari_uniform.dmi' + icon_override = 'icons/mob/species/teshari/teshari_uniform.dmi' icon_state = "tesh_uniform_bo" item_state = "tesh_uniform_bo" body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/under/seromi/undercoat/standard/black_orange +/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/seromi/undercoat/standard/black_grey +/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/seromi/undercoat/standard/black_white +/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/seromi/undercoat/standard/black_red +/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/seromi/undercoat/standard/black +/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/seromi/undercoat/standard/black_yellow +/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/seromi/undercoat/standard/black_green +/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/seromi/undercoat/standard/black_blue +/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/seromi/undercoat/standard/black_purple +/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/seromi/undercoat/standard/black_pink +/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/seromi/undercoat/standard/black_brown +/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/seromi/undercoat/standard/orange_grey +/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/seromi/undercoat/standard/rainbow +/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/seromi/undercoat/standard/lightgrey_grey +/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/seromi/undercoat/standard/white_grey +/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/seromi/undercoat/standard/red_grey +/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/seromi/undercoat/standard/orange +/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/seromi/undercoat/standard/yellow_grey +/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/seromi/undercoat/standard/green_grey +/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/seromi/undercoat/standard/blue_grey +/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/seromi/undercoat/standard/purple_grey +/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/seromi/undercoat/standard/pink_grey +/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/seromi/undercoat/standard/brown_grey +/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/seromi/undercoat/jobs - icon = 'icons/mob/species/seromi/deptjacket.dmi' - icon_override = 'icons/mob/species/seromi/deptjacket.dmi' +/obj/item/clothing/under/teshari/undercoat/jobs + icon = 'icons/mob/species/teshari/deptjacket.dmi' + icon_override = 'icons/mob/species/teshari/deptjacket.dmi' -/obj/item/clothing/under/seromi/undercoat/jobs/cap +/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/seromi/undercoat/jobs/hop +/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/seromi/undercoat/jobs/ce +/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/seromi/undercoat/jobs/hos +/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/seromi/undercoat/jobs/rd +/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/seromi/undercoat/jobs/engineer +/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/seromi/undercoat/jobs/atmos +/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/seromi/undercoat/jobs/cmo +/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/seromi/undercoat/jobs/qm +/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/seromi/undercoat/jobs/cargo +/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/seromi/undercoat/jobs/mining +/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/seromi/undercoat/jobs/medical +/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/seromi/undercoat/jobs/chemistry +/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/seromi/undercoat/jobs/viro +/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/seromi/undercoat/jobs/psych +/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/seromi/undercoat/jobs/para +/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/seromi/undercoat/jobs/sci +/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/seromi/undercoat/jobs/robo +/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/seromi/undercoat/jobs/sec +/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/seromi/undercoat/jobs/service +/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/seromi/undercoat/jobs/iaa +/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" diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index f995e2f4d90..22e57ff15ed 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -11,7 +11,7 @@ var/list/holder_mob_icon_cache = list() show_messages = 1 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi' ) diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index b895ccfdbc9..32c579f82d0 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -187,7 +187,7 @@ else return pick(ai_names) -/datum/language/seromi +/datum/language/teshari name = LANGUAGE_SCHECHI desc = "A trilling language spoken by the diminutive Teshari." speech_verb = "chirps" @@ -203,7 +203,7 @@ "ci", "ri", "mi", "si", "ni", "ti", "li", "shi", "schi", "i", "i" ) -/datum/language/seromi/get_random_name(gender) +/datum/language/teshari/get_random_name(gender) return ..(gender, 2, 4, 1.5) diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm similarity index 92% rename from code/modules/mob/living/carbon/human/species/station/seromi.dm rename to code/modules/mob/living/carbon/human/species/station/teshari.dm index 135c8f30ca3..3686ef72555 100644 --- a/code/modules/mob/living/carbon/human/species/station/seromi.dm +++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm @@ -33,12 +33,12 @@ move_trail = /obj/effect/decal/cleanable/blood/tracks/paw - icobase = 'icons/mob/human_races/r_seromi.dmi' - deform = 'icons/mob/human_races/r_seromi.dmi' - damage_overlays = 'icons/mob/human_races/masks/dam_seromi.dmi' - damage_mask = 'icons/mob/human_races/masks/dam_mask_seromi.dmi' - blood_mask = 'icons/mob/human_races/masks/blood_seromi.dmi' - suit_storage_icon = 'icons/mob/species/seromi/belt_mirror.dmi' + icobase = 'icons/mob/human_races/r_teshari.dmi' + deform = 'icons/mob/human_races/r_teshari.dmi' + damage_overlays = 'icons/mob/human_races/masks/dam_teshari.dmi' + damage_mask = 'icons/mob/human_races/masks/dam_mask_teshari.dmi' + blood_mask = 'icons/mob/human_races/masks/blood_teshari.dmi' + suit_storage_icon = 'icons/mob/species/teshari/belt_mirror.dmi' fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying. @@ -102,15 +102,15 @@ has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), BP_GROIN = list("path" = /obj/item/organ/external/groin), - BP_HEAD = list("path" = /obj/item/organ/external/head/seromi), + BP_HEAD = list("path" = /obj/item/organ/external/head/teshari), BP_L_ARM = list("path" = /obj/item/organ/external/arm), BP_R_ARM = list("path" = /obj/item/organ/external/arm/right), BP_L_LEG = list("path" = /obj/item/organ/external/leg), BP_R_LEG = list("path" = /obj/item/organ/external/leg/right), - BP_L_HAND = list("path" = /obj/item/organ/external/hand/seromi), - BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/seromi), - BP_L_FOOT = list("path" = /obj/item/organ/external/foot/seromi), - BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/seromi) + BP_L_HAND = list("path" = /obj/item/organ/external/hand/teshari), + BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/teshari), + BP_L_FOOT = list("path" = /obj/item/organ/external/foot/teshari), + BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/teshari) ) has_organ = list( diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm index abf287c0fb9..43210407bc1 100644 --- a/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm +++ b/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm @@ -83,21 +83,21 @@ /datum/species/shapeshifter/promethean/avatar/teshari name = "Virtual Reality Teshari" - icobase = 'icons/mob/human_races/r_seromi.dmi' - deform = 'icons/mob/human_races/r_seromi.dmi' + icobase = 'icons/mob/human_races/r_teshari.dmi' + deform = 'icons/mob/human_races/r_teshari.dmi' appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), BP_GROIN = list("path" = /obj/item/organ/external/groin), - BP_HEAD = list("path" = /obj/item/organ/external/head/seromi), + BP_HEAD = list("path" = /obj/item/organ/external/head/teshari), BP_L_ARM = list("path" = /obj/item/organ/external/arm), BP_R_ARM = list("path" = /obj/item/organ/external/arm/right), BP_L_LEG = list("path" = /obj/item/organ/external/leg), BP_R_LEG = list("path" = /obj/item/organ/external/leg/right), - BP_L_HAND = list("path" = /obj/item/organ/external/hand/seromi), - BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/seromi), - BP_L_FOOT = list("path" = /obj/item/organ/external/foot/seromi), - BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/seromi) + BP_L_HAND = list("path" = /obj/item/organ/external/hand/teshari), + BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/teshari), + BP_L_FOOT = list("path" = /obj/item/organ/external/foot/teshari), + BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/teshari) ) /datum/species/shapeshifter/promethean/avatar/diona diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 012591a8953..0b8d75b84e3 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -503,16 +503,16 @@ desc = "" icon_state = "chimptail_s" -/datum/sprite_accessory/tail/special/seromitail - name = "seromi tail" +/datum/sprite_accessory/tail/special/tesharitail + name = "teshari tail" desc = "" icon_state = "seromitail_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) -/datum/sprite_accessory/tail/special/seromitailfeathered - name = "seromi tail w/ feathers" +/datum/sprite_accessory/tail/special/tesharitailfeathered + name = "teshari tail w/ feathers" desc = "" icon_state = "seromitail_s" extra_overlay = "seromitail_feathers_s" @@ -607,15 +607,15 @@ icon_state = "chimptail_hc_s" do_colouration = 1 -/datum/sprite_accessory/tail/special/seromitailhc - name = "seromi tail, colorable" +/datum/sprite_accessory/tail/special/tesharitailhc + name = "teshari tail, colorable" desc = "" icon_state = "seromitail_hc_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY -/datum/sprite_accessory/tail/special/seromitailfeatheredhc - name = "seromi tail w/ feathers, colorable" +/datum/sprite_accessory/tail/special/tesharitailfeatheredhc + name = "teshari tail w/ feathers, colorable" desc = "" icon_state = "seromitail_feathers_hc_s" do_colouration = 1 diff --git a/code/modules/organs/robolimbs_custom.dm b/code/modules/organs/robolimbs_custom.dm index 727db0927a4..ba9704ffae5 100644 --- a/code/modules/organs/robolimbs_custom.dm +++ b/code/modules/organs/robolimbs_custom.dm @@ -164,7 +164,7 @@ VS Edit - anyone can select these. */ icon = 'icons/mob/human_races/cyberlimbs/DSITeshari/dsi_teshari.dmi' lifelike = 1 skin_tone = 1 - suggested_species = "Teshari" + suggested_species = SPECIES_TESHARI /datum/robolimb/dsi_teshari/New() species_cannot_use = GLOB.all_species.Copy() diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 9e465ce8bac..bad69a23808 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -390,7 +390,7 @@ /obj/item/organ/external/head/skrell eye_icon = "skrell_eyes_s" -/obj/item/organ/external/head/seromi +/obj/item/organ/external/head/teshari eye_icon = "eyes_seromi" /obj/item/organ/external/head/no_eyes diff --git a/code/modules/organs/subtypes/teshari.dm b/code/modules/organs/subtypes/teshari.dm new file mode 100644 index 00000000000..00f673482c9 --- /dev/null +++ b/code/modules/organs/subtypes/teshari.dm @@ -0,0 +1,8 @@ +/obj/item/organ/external/foot/teshari + body_hair = "feathers" +/obj/item/organ/external/foot/right/teshari + body_hair = "feathers" +/obj/item/organ/external/hand/teshari + body_hair = "feathers" +/obj/item/organ/external/hand/right/teshari + body_hair = "feathers" diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index f05a1056fde..db67b48d43f 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //The advanced pea-green monochrome lcd of tomorrow. @@ -492,3 +493,499 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/emp_act(severity) for(var/atom/A in src) A.emp_act(severity) +======= + +//The advanced pea-green monochrome lcd of tomorrow. + +var/global/list/obj/item/device/pda/PDAs = list() + +/obj/item/device/pda + name = "\improper PDA" + desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." + icon = 'icons/obj/pda.dmi' + icon_state = "pda" + item_state = "electronic" + w_class = ITEMSIZE_SMALL + slot_flags = SLOT_ID | SLOT_BELT + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/id.dmi') + + //Main variables + var/pdachoice = 1 + var/owner = null + var/default_cartridge = 0 // Access level defined by cartridge + var/obj/item/weapon/cartridge/cartridge = null //current cartridge + + //Secondary variables + var/model_name = "Thinktronic 5230 Personal Data Assistant" + var/datum/data/pda/utility/scanmode/scanmode = null + + var/lock_code = "" // Lockcode to unlock uplink + var/honkamt = 0 //How many honks left when infected with honk.exe + var/mimeamt = 0 //How many silence left when infected with mime.exe + var/detonate = 1 // Can the PDA be blown up? + var/ttone = "beep" //The ringtone! + var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg', + "boom" = 'sound/effects/explosionfar.ogg', + "slip" = 'sound/misc/slip.ogg', + "honk" = 'sound/items/bikehorn.ogg', + "SKREE" = 'sound/voice/shriek1.ogg', + // "holy" = 'sound/items/PDA/ambicha4-short.ogg', + "xeno" = 'sound/voice/hiss1.ogg') + var/hidden = 0 // Is the PDA hidden from the PDA list? + var/touch_silent = 0 //If 1, no beeps on interacting. + + var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. + var/ownjob = null //related to above - this is assignment (potentially alt title) + var/ownrank = null // this one is rank, never alt title + + var/obj/item/device/paicard/pai = null // A slot for a personal AI device + + var/spam_proof = FALSE // If true, it can't be spammed by random events. + + var/datum/data/pda/app/current_app = null + var/datum/data/pda/app/lastapp = null + var/list/programs = list( + new/datum/data/pda/app/main_menu, + new/datum/data/pda/app/notekeeper, + new/datum/data/pda/app/news, + new/datum/data/pda/app/messenger, + new/datum/data/pda/app/manifest, + new/datum/data/pda/app/atmos_scanner, + new/datum/data/pda/utility/scanmode/notes, + new/datum/data/pda/utility/flashlight) + var/list/shortcut_cache = list() + var/list/shortcut_cat_order = list() + var/list/notifying_programs = list() + var/retro_mode = 0 + +/obj/item/device/pda/examine(mob/user) + . = ..() + if(Adjacent(user)) + . += "The time [stationtime2text()] is displayed in the corner of the screen." + +/obj/item/device/pda/CtrlClick() + if(issilicon(usr)) + return + + if(can_use(usr)) + remove_pen() + return + ..() + +/obj/item/device/pda/AltClick() + if(issilicon(usr)) + return + + if ( can_use(usr) ) + if(id) + remove_id() + else + to_chat(usr, "This PDA does not have an ID in it.") + +/obj/item/device/pda/proc/play_ringtone() + var/S + + if(ttone in ttone_sound) + S = ttone_sound[ttone] + else + S = 'sound/machines/twobeep.ogg' + playsound(loc, S, 50, 1) + for(var/mob/O in hearers(3, loc)) + O.show_message(text("[bicon(src)] *[ttone]*")) + +/obj/item/device/pda/proc/set_ringtone() + var/t = input("Please enter new ringtone", name, ttone) as text + if(in_range(src, usr) && loc == usr) + if(t) + if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code))) + to_chat(usr, "The PDA softly beeps.") + close(usr) + else + t = sanitize(copytext(t, 1, 20)) + ttone = t + return 1 + else + close(usr) + return 0 + +/obj/item/device/pda/New(var/mob/living/carbon/human/H) + ..() + PDAs += src + PDAs = sortAtom(PDAs) + update_programs() + if(default_cartridge) + cartridge = new default_cartridge(src) + cartridge.update_programs(src) + new /obj/item/weapon/pen(src) + pdachoice = isnull(H) ? 1 : (ishuman(H) ? H.pdachoice : 1) + switch(pdachoice) + if(1) icon = 'icons/obj/pda.dmi' + if(2) icon = 'icons/obj/pda_slim.dmi' + if(3) icon = 'icons/obj/pda_old.dmi' + if(4) icon = 'icons/obj/pda_rugged.dmi' + if(5) icon = 'icons/obj/pda_holo.dmi' + if(6) + icon = 'icons/obj/pda_wrist.dmi' + item_state = icon_state + item_icons = list( + slot_belt_str = 'icons/mob/pda_wrist.dmi', + slot_wear_id_str = 'icons/mob/pda_wrist.dmi', + slot_gloves_str = 'icons/mob/pda_wrist.dmi' + ) + desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a wrist-bound version." + slot_flags = SLOT_ID | SLOT_BELT | SLOT_GLOVES + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi', + SPECIES_VR_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi', + ) + else + icon = 'icons/obj/pda_old.dmi' + log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.") + start_program(find_program(/datum/data/pda/app/main_menu)) + +/obj/item/device/pda/proc/can_use(mob/user) + return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE) + +/obj/item/device/pda/GetAccess() + if(id) + return id.GetAccess() + else + return ..() + +/obj/item/device/pda/GetID() + return id + +/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) + var/mob/M = usr + if((!istype(over_object, /obj/screen)) && can_use(usr)) + return attack_self(M) + return + +/obj/item/device/pda/proc/close(mob/user) + SStgui.close_uis(src) + +/obj/item/device/pda/attack_self(mob/user as mob) + user.set_machine(src) + + if(active_uplink_check(user)) + return + + tgui_interact(user) + return + +/obj/item/device/pda/proc/start_program(datum/data/pda/P) + if(P && ((P in programs) || (cartridge && (P in cartridge.programs)))) + return P.start() + return 0 + +/obj/item/device/pda/proc/find_program(type) + var/datum/data/pda/A = locate(type) in programs + if(A) + return A + if(cartridge) + A = locate(type) in cartridge.programs + if(A) + return A + return null + +// force the cache to rebuild on update_ui +/obj/item/device/pda/proc/update_shortcuts() + shortcut_cache.Cut() + +/obj/item/device/pda/proc/update_programs() + for(var/A in programs) + var/datum/data/pda/P = A + P.pda = src + +/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P) + //TODO: sometimes these attacks show up on the message server + var/i = rand(1,100) + var/j = rand(0,1) //Possibility of losing the PDA after the detonation + var/message = "" + var/mob/living/M = null + if(ismob(P.loc)) + M = P.loc + + //switch(i) //Yes, the overlapping cases are intended. + if(i<=10) //The traditional explosion + P.explode() + j=1 + message += "Your [P] suddenly explodes!" + if(i>=10 && i<= 20) //The PDA burns a hole in the holder. + j=1 + if(M && isliving(M)) + M.apply_damage( rand(30,60) , BURN) + message += "You feel a searing heat! Your [P] is burning!" + if(i>=20 && i<=25) //EMP + empulse(P.loc, 1, 2, 4, 6, 1) + message += "Your [P] emits a wave of electromagnetic energy!" + if(i>=25 && i<=40) //Smoke + var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem + S.attach(P.loc) + S.set_up(P, 10, 0, P.loc) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) + S.start() + message += "Large clouds of smoke billow forth from your [P]!" + if(i>=40 && i<=45) //Bad smoke + var/datum/effect/effect/system/smoke_spread/bad/B = new /datum/effect/effect/system/smoke_spread/bad + B.attach(P.loc) + B.set_up(P, 10, 0, P.loc) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) + B.start() + message += "Large clouds of noxious smoke billow forth from your [P]!" + if(i>=65 && i<=75) //Weaken + if(M && isliving(M)) + M.apply_effects(0,1) + message += "Your [P] flashes with a blinding white light! You feel weaker." + if(i>=75 && i<=85) //Stun and stutter + if(M && isliving(M)) + M.apply_effects(1,0,0,0,1) + message += "Your [P] flashes with a blinding white light! You feel weaker." + if(i>=85) //Sparks + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, P.loc) + s.start() + message += "Your [P] begins to spark violently!" + if(i>45 && i<65 && prob(50)) //Nothing happens + message += "Your [P] bleeps loudly." + j = prob(10) + + if(j && detonate) //This kills the PDA + qdel(P) + if(message) + message += "It melts in a puddle of plastic." + else + message += "Your [P] shatters in a thousand pieces!" + + if(M && isliving(M)) + message = "[message]" + M.show_message(message, 1) + +/obj/item/device/pda/proc/remove_id() + if (id) + if (ismob(loc)) + var/mob/M = loc + M.put_in_hands(id) + to_chat(usr, "You remove the ID from the [name].") + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) + else + id.loc = get_turf(src) + id = null + +/obj/item/device/pda/proc/remove_pen() + var/obj/item/weapon/pen/O = locate() in src + if(O) + if(istype(loc, /mob)) + var/mob/M = loc + if(M.get_active_hand() == null) + M.put_in_hands(O) + to_chat(usr, "You remove \the [O] from \the [src].") + return + O.loc = get_turf(src) + else + to_chat(usr, "This PDA does not have a pen in it.") + +/obj/item/device/pda/verb/verb_reset_pda() + set category = "Object" + set name = "Reset PDA" + set src in usr + + if(issilicon(usr)) + return + + if(can_use(usr)) + start_program(find_program(/datum/data/pda/app/main_menu)) + notifying_programs.Cut() + overlays -= image('icons/obj/pda.dmi', "pda-r") + to_chat(usr, "You press the reset button on \the [src].") + else + to_chat(usr, "You cannot do this while restrained.") + +/obj/item/device/pda/verb/verb_remove_id() + set category = "Object" + set name = "Remove id" + set src in usr + + if(issilicon(usr)) + return + + if ( can_use(usr) ) + if(id) + remove_id() + else + to_chat(usr, "This PDA does not have an ID in it.") + else + to_chat(usr, "You cannot do this while restrained.") + + +/obj/item/device/pda/verb/verb_remove_pen() + set category = "Object" + set name = "Remove pen" + set src in usr + + if(issilicon(usr)) + return + + if ( can_use(usr) ) + remove_pen() + else + to_chat(usr, "You cannot do this while restrained.") + +/obj/item/device/pda/verb/verb_remove_cartridge() + set category = "Object" + set name = "Remove cartridge" + set src in usr + + if(issilicon(usr)) + return + + if(!can_use(usr)) + to_chat(usr, "You cannot do this while restrained.") + return + + if(isnull(cartridge)) + to_chat(usr, "There's no cartridge to eject.") + return + + cartridge.forceMove(get_turf(src)) + if(ismob(loc)) + var/mob/M = loc + M.put_in_hands(cartridge) + // mode = 0 + // scanmode = 0 + if (cartridge.radio) + cartridge.radio.hostpda = null + to_chat(usr, "You remove \the [cartridge] from the [name].") + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) + cartridge = null + update_programs() + update_shortcuts() + start_program(find_program(/datum/data/pda/app/main_menu)) + + +/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. + if(choice == 1) + if (id) + remove_id() + return 1 + else + var/obj/item/I = user.get_active_hand() + if (istype(I, /obj/item/weapon/card/id) && user.unEquip(I)) + I.loc = src + id = I + return 1 + else + var/obj/item/weapon/card/I = user.get_active_hand() + if (istype(I, /obj/item/weapon/card/id) && I:registered_name && user.unEquip(I)) + var/obj/old_id = id + I.loc = src + id = I + user.put_in_hands(old_id) + return 1 + return 0 + +// access to status display signals +/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob) + ..() + if(istype(C, /obj/item/weapon/cartridge) && !cartridge) + cartridge = C + user.drop_item() + cartridge.loc = src + cartridge.update_programs(src) + update_shortcuts() + to_chat(usr, "You insert [cartridge] into [src].") + if(cartridge.radio) + cartridge.radio.hostpda = src + + else if(istype(C, /obj/item/weapon/card/id)) + var/obj/item/weapon/card/id/idcard = C + if(!idcard.registered_name) + to_chat(user, "\The [src] rejects the ID.") + return + if(!owner) + owner = idcard.registered_name + ownjob = idcard.assignment + ownrank = idcard.rank + name = "PDA-[owner] ([ownjob])" + to_chat(user, "Card scanned.") + else + //Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand. + if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) ) + if(id_check(user, 2)) + to_chat(user, "You put the ID into \the [src]'s slot.") + updateSelfDialog()//Update self dialog on success. + return //Return in case of failed check or when successful. + updateSelfDialog()//For the non-input related code. + else if(istype(C, /obj/item/device/paicard) && !src.pai) + user.drop_item() + C.loc = src + pai = C + to_chat(user, "You slot \the [C] into \the [src].") + SStgui.update_uis(src) // update all UIs attached to src + else if(istype(C, /obj/item/weapon/pen)) + var/obj/item/weapon/pen/O = locate() in src + if(O) + to_chat(user, "There is already a pen in \the [src].") + else + user.drop_item() + C.loc = src + to_chat(user, "You slot \the [C] into \the [src].") + return + +/obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob) + if (istype(C, /mob/living/carbon) && scanmode) + scanmode.scan_mob(C, user) + +/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) + if(proximity && scanmode) + scanmode.scan_atom(A, user) + +/obj/item/device/pda/proc/explode() //This needs tuning. //Sure did. + if(!src.detonate) return + var/turf/T = get_turf(src.loc) + if(T) + T.hotspot_expose(700,125) + explosion(T, 0, 0, 1, rand(1,2)) + return + +/obj/item/device/pda/Destroy() + PDAs -= src + if (src.id && prob(90)) //IDs are kept in 90% of the cases + src.id.forceMove(get_turf(src.loc)) + else + QDEL_NULL(src.id) + + current_app = null + scanmode = null + QDEL_NULL(pai) + QDEL_LIST(programs) + QDEL_NULL(cartridge) + return ..() + +//Some spare PDAs in a box +/obj/item/weapon/storage/box/PDAs + name = "box of spare PDAs" + desc = "A box of spare PDA microcomputers." + icon = 'icons/obj/pda.dmi' + icon_state = "pdabox" + +/obj/item/weapon/storage/box/PDAs/New() + ..() + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/weapon/cartridge/head(src) + + var/newcart = pick( /obj/item/weapon/cartridge/engineering, + /obj/item/weapon/cartridge/security, + /obj/item/weapon/cartridge/medical, + /obj/item/weapon/cartridge/signal/science, + /obj/item/weapon/cartridge/quartermaster) + new newcart(src) + +// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP +/obj/item/device/pda/emp_act(severity) + for(var/atom/A in src) + A.emp_act(severity) +>>>>>>> 5670946... Merge pull request #7991 from MistakeNot4892/bird2 diff --git a/icons/mob/human_races/masks/blood_seromi.dmi b/icons/mob/human_races/masks/blood_teshari.dmi similarity index 100% rename from icons/mob/human_races/masks/blood_seromi.dmi rename to icons/mob/human_races/masks/blood_teshari.dmi diff --git a/icons/mob/human_races/masks/dam_mask_seromi.dmi b/icons/mob/human_races/masks/dam_mask_teshari.dmi similarity index 100% rename from icons/mob/human_races/masks/dam_mask_seromi.dmi rename to icons/mob/human_races/masks/dam_mask_teshari.dmi diff --git a/icons/mob/human_races/masks/dam_seromi.dmi b/icons/mob/human_races/masks/dam_teshari.dmi similarity index 100% rename from icons/mob/human_races/masks/dam_seromi.dmi rename to icons/mob/human_races/masks/dam_teshari.dmi diff --git a/icons/mob/human_races/r_seromi.dmi b/icons/mob/human_races/r_teshari.dmi similarity index 100% rename from icons/mob/human_races/r_seromi.dmi rename to icons/mob/human_races/r_teshari.dmi diff --git a/icons/mob/species/seromi/back.dmi b/icons/mob/species/teshari/back.dmi similarity index 100% rename from icons/mob/species/seromi/back.dmi rename to icons/mob/species/teshari/back.dmi diff --git a/icons/mob/species/seromi/belt.dmi b/icons/mob/species/teshari/belt.dmi similarity index 100% rename from icons/mob/species/seromi/belt.dmi rename to icons/mob/species/teshari/belt.dmi diff --git a/icons/mob/species/seromi/belt_mirror.dmi b/icons/mob/species/teshari/belt_mirror.dmi similarity index 100% rename from icons/mob/species/seromi/belt_mirror.dmi rename to icons/mob/species/teshari/belt_mirror.dmi diff --git a/icons/mob/species/seromi/deptcloak.dmi b/icons/mob/species/teshari/deptcloak.dmi similarity index 100% rename from icons/mob/species/seromi/deptcloak.dmi rename to icons/mob/species/teshari/deptcloak.dmi diff --git a/icons/mob/species/seromi/deptjacket.dmi b/icons/mob/species/teshari/deptjacket.dmi similarity index 100% rename from icons/mob/species/seromi/deptjacket.dmi rename to icons/mob/species/teshari/deptjacket.dmi diff --git a/icons/mob/species/seromi/ears.dmi b/icons/mob/species/teshari/ears.dmi similarity index 100% rename from icons/mob/species/seromi/ears.dmi rename to icons/mob/species/teshari/ears.dmi diff --git a/icons/mob/species/seromi/eyes.dmi b/icons/mob/species/teshari/eyes.dmi similarity index 100% rename from icons/mob/species/seromi/eyes.dmi rename to icons/mob/species/teshari/eyes.dmi diff --git a/icons/mob/species/seromi/gloves.dmi b/icons/mob/species/teshari/gloves.dmi similarity index 100% rename from icons/mob/species/seromi/gloves.dmi rename to icons/mob/species/teshari/gloves.dmi diff --git a/icons/mob/species/seromi/handcuffs.dmi b/icons/mob/species/teshari/handcuffs.dmi similarity index 100% rename from icons/mob/species/seromi/handcuffs.dmi rename to icons/mob/species/teshari/handcuffs.dmi diff --git a/icons/mob/species/seromi/head.dmi b/icons/mob/species/teshari/head.dmi similarity index 100% rename from icons/mob/species/seromi/head.dmi rename to icons/mob/species/teshari/head.dmi diff --git a/icons/mob/species/seromi/id.dmi b/icons/mob/species/teshari/id.dmi similarity index 100% rename from icons/mob/species/seromi/id.dmi rename to icons/mob/species/teshari/id.dmi diff --git a/icons/mob/species/seromi/masks.dmi b/icons/mob/species/teshari/masks.dmi similarity index 100% rename from icons/mob/species/seromi/masks.dmi rename to icons/mob/species/teshari/masks.dmi diff --git a/icons/mob/species/seromi/pda_wrist.dmi b/icons/mob/species/teshari/pda_wrist.dmi similarity index 100% rename from icons/mob/species/seromi/pda_wrist.dmi rename to icons/mob/species/teshari/pda_wrist.dmi diff --git a/icons/mob/species/seromi/pilot_helmet.dmi b/icons/mob/species/teshari/pilot_helmet.dmi similarity index 100% rename from icons/mob/species/seromi/pilot_helmet.dmi rename to icons/mob/species/teshari/pilot_helmet.dmi diff --git a/icons/mob/species/seromi/shoes.dmi b/icons/mob/species/teshari/shoes.dmi similarity index 100% rename from icons/mob/species/seromi/shoes.dmi rename to icons/mob/species/teshari/shoes.dmi diff --git a/icons/mob/species/seromi/suit.dmi b/icons/mob/species/teshari/suit.dmi similarity index 100% rename from icons/mob/species/seromi/suit.dmi rename to icons/mob/species/teshari/suit.dmi diff --git a/icons/mob/species/seromi/teshari_cloak.dmi b/icons/mob/species/teshari/teshari_cloak.dmi similarity index 100% rename from icons/mob/species/seromi/teshari_cloak.dmi rename to icons/mob/species/teshari/teshari_cloak.dmi diff --git a/icons/mob/species/seromi/teshari_hood.dmi b/icons/mob/species/teshari/teshari_hood.dmi similarity index 100% rename from icons/mob/species/seromi/teshari_hood.dmi rename to icons/mob/species/teshari/teshari_hood.dmi diff --git a/icons/mob/species/seromi/teshari_uniform.dmi b/icons/mob/species/teshari/teshari_uniform.dmi similarity index 100% rename from icons/mob/species/seromi/teshari_uniform.dmi rename to icons/mob/species/teshari/teshari_uniform.dmi diff --git a/icons/mob/species/seromi/ties.dmi b/icons/mob/species/teshari/ties.dmi similarity index 100% rename from icons/mob/species/seromi/ties.dmi rename to icons/mob/species/teshari/ties.dmi diff --git a/icons/mob/species/seromi/uniform.dmi b/icons/mob/species/teshari/uniform.dmi similarity index 100% rename from icons/mob/species/seromi/uniform.dmi rename to icons/mob/species/teshari/uniform.dmi diff --git a/icons/obj/clothing/species/seromi/hats.dmi b/icons/obj/clothing/species/teshari/hats.dmi similarity index 100% rename from icons/obj/clothing/species/seromi/hats.dmi rename to icons/obj/clothing/species/teshari/hats.dmi diff --git a/icons/obj/clothing/species/seromi/suits.dmi b/icons/obj/clothing/species/teshari/suits.dmi similarity index 100% rename from icons/obj/clothing/species/seromi/suits.dmi rename to icons/obj/clothing/species/teshari/suits.dmi diff --git a/icons/obj/clothing/species/seromi/uniform.dmi b/icons/obj/clothing/species/teshari/uniform.dmi similarity index 100% rename from icons/obj/clothing/species/seromi/uniform.dmi rename to icons/obj/clothing/species/teshari/uniform.dmi diff --git a/maps/southern_cross/items/clothing/sc_accessory.dm b/maps/southern_cross/items/clothing/sc_accessory.dm index 67dd36ec891..66d977ffc2e 100644 --- a/maps/southern_cross/items/clothing/sc_accessory.dm +++ b/maps/southern_cross/items/clothing/sc_accessory.dm @@ -10,5 +10,5 @@ desc = "Sturdy mess of black synthcotton belts and buckles." icon_state = "pilot_webbing2" sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/ties.dmi' - ) \ No newline at end of file + SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi' + ) \ No newline at end of file diff --git a/maps/southern_cross/items/clothing/sc_suit.dm b/maps/southern_cross/items/clothing/sc_suit.dm index 204db3afd19..2b15324f4d1 100644 --- a/maps/southern_cross/items/clothing/sc_suit.dm +++ b/maps/southern_cross/items/clothing/sc_suit.dm @@ -8,8 +8,8 @@ item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") icon = 'maps/southern_cross/icons/obj/sc_suit.dmi' sprite_sheets = list( - "Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_suit.dmi' - ) + SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_suit.dmi' + ) min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Misc diff --git a/maps/southern_cross/items/clothing/sc_under.dm b/maps/southern_cross/items/clothing/sc_under.dm index 3f7f7eb1a8c..ea024abe7ae 100644 --- a/maps/southern_cross/items/clothing/sc_under.dm +++ b/maps/southern_cross/items/clothing/sc_under.dm @@ -8,8 +8,8 @@ item_icons = list(slot_w_uniform_str = 'maps/southern_cross/icons/mob/sc_under.dmi') icon = 'maps/southern_cross/icons/obj/sc_uniforms.dmi' sprite_sheets = list( - "Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' - ) + SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' + ) starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1) /obj/item/clothing/under/rank/pilot1/no_webbing @@ -25,8 +25,8 @@ item_icons = list(slot_w_uniform_str = 'maps/southern_cross/icons/mob/sc_under.dmi') icon = 'maps/southern_cross/icons/obj/sc_uniforms.dmi' sprite_sheets = list( - "Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' - ) + SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' + ) starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot2) /obj/item/clothing/under/rank/pilot2/no_webbing diff --git a/vorestation.dme b/vorestation.dme index 24bf823bffe..a698ff5d1ab 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1994,8 +1994,8 @@ #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\utility_vr.dm" #include "code\modules\clothing\suits\wiz_robe.dm" -#include "code\modules\clothing\suits\aliens\seromi.dm" #include "code\modules\clothing\suits\aliens\tajara.dm" +#include "code\modules\clothing\suits\aliens\teshari.dm" #include "code\modules\clothing\suits\aliens\unathi.dm" #include "code\modules\clothing\suits\aliens\vox.dm" #include "code\modules\clothing\under\color.dm" @@ -2030,7 +2030,7 @@ #include "code\modules\clothing\under\jobs\engineering.dm" #include "code\modules\clothing\under\jobs\medsci.dm" #include "code\modules\clothing\under\jobs\security.dm" -#include "code\modules\clothing\under\xenos\seromi.dm" +#include "code\modules\clothing\under\xenos\teshari.dm" #include "code\modules\clothing\under\xenos\vox.dm" #include "code\modules\compass\^compass.dm" #include "code\modules\compass\_compass.dm" @@ -2656,6 +2656,7 @@ #include "code\modules\mob\living\carbon\human\species\station\monkey.dm" #include "code\modules\mob\living\carbon\human\species\station\monkey_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans.dm" +<<<<<<< HEAD:vorestation.dme #include "code\modules\mob\living\carbon\human\species\station\prometheans_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\seromi.dm" #include "code\modules\mob\living\carbon\human\species\station\station.dm" @@ -2673,6 +2674,10 @@ #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_objs.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_recipies.dm" +======= +#include "code\modules\mob\living\carbon\human\species\station\station.dm" +#include "code\modules\mob\living\carbon\human\species\station\teshari.dm" +>>>>>>> 5670946... Merge pull request #7991 from MistakeNot4892/bird2:polaris.dme #include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm" #include "code\modules\mob\living\carbon\human\species\virtual_reality\opaque_form.dm" #include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_powers.dm" @@ -3121,13 +3126,20 @@ #include "code\modules\organs\subtypes\machine.dm" #include "code\modules\organs\subtypes\nano.dm" #include "code\modules\organs\subtypes\replicant.dm" +<<<<<<< HEAD:vorestation.dme #include "code\modules\organs\subtypes\seromi.dm" #include "code\modules\organs\subtypes\shadekin.dm" #include "code\modules\organs\subtypes\shadekin_vr.dm" +======= +>>>>>>> 5670946... Merge pull request #7991 from MistakeNot4892/bird2:polaris.dme #include "code\modules\organs\subtypes\slime.dm" #include "code\modules\organs\subtypes\slime_vr.dm" #include "code\modules\organs\subtypes\standard.dm" +<<<<<<< HEAD:vorestation.dme #include "code\modules\organs\subtypes\standard_vr.dm" +======= +#include "code\modules\organs\subtypes\teshari.dm" +>>>>>>> 5670946... Merge pull request #7991 from MistakeNot4892/bird2:polaris.dme #include "code\modules\organs\subtypes\unathi.dm" #include "code\modules\organs\subtypes\unbreakable.dm" #include "code\modules\organs\subtypes\unseverable.dm"