Surface rename of Seromi to Teshari.

This commit is contained in:
Zuhayr
2016-02-06 12:34:31 +10:30
parent 59e969ec13
commit 19014807fd
16 changed files with 37 additions and 37 deletions

View File

@@ -174,7 +174,7 @@
w_class = 3.0 w_class = 3.0
origin_tech = list(TECH_MATERIAL = 1) origin_tech = list(TECH_MATERIAL = 1)
var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/handcuffs.dmi') sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi')
/obj/item/weapon/caution /obj/item/weapon/caution
desc = "Caution! Wet Floor!" desc = "Caution! Wet Floor!"

View File

@@ -11,7 +11,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
item_state = "electronic" item_state = "electronic"
w_class = 2.0 w_class = 2.0
slot_flags = SLOT_ID | SLOT_BELT slot_flags = SLOT_ID | SLOT_BELT
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/id.dmi') sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/id.dmi')
//Main variables //Main variables
var/pdachoice = 1 var/pdachoice = 1

View File

@@ -95,7 +95,7 @@
item_state = "card-id" item_state = "card-id"
sprite_sheets = list( sprite_sheets = list(
"Seromi" = 'icons/mob/species/seromi/id.dmi' "Teshari" = 'icons/mob/species/seromi/id.dmi'
) )
var/access = list() var/access = list()

View File

@@ -17,7 +17,7 @@
var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
var/cuff_sound = 'sound/weapons/handcuffs.ogg' var/cuff_sound = 'sound/weapons/handcuffs.ogg'
var/cuff_type = "handcuffs" var/cuff_type = "handcuffs"
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/handcuffs.dmi') sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi')
/obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user) /obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user)

View File

@@ -18,7 +18,7 @@
slot_r_hand_str = "backpack", slot_r_hand_str = "backpack",
) )
sprite_sheets = list( sprite_sheets = list(
"Seromi" = 'icons/mob/species/seromi/back.dmi' "Teshari" = 'icons/mob/species/seromi/back.dmi'
) )
w_class = 4 w_class = 4
slot_flags = SLOT_BACK slot_flags = SLOT_BACK

View File

@@ -6,7 +6,7 @@
item_state = "utility" item_state = "utility"
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined") attack_verb = list("whipped", "lashed", "disciplined")
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/belt.dmi') sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/belt.dmi')
var/show_above_suit = 0 var/show_above_suit = 0

View File

@@ -24,7 +24,7 @@ var/list/global/tank_gauge_cache = list()
throw_range = 4 throw_range = 4
sprite_sheets = list( sprite_sheets = list(
"Seromi" = 'icons/mob/species/seromi/back.dmi' "Teshari" = 'icons/mob/species/seromi/back.dmi'
) )
var/datum/gas_mixture/air_contents = null var/datum/gas_mixture/air_contents = null

View File

@@ -101,7 +101,7 @@
w_class = 1.0 w_class = 1.0
throwforce = 2 throwforce = 2
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/ears.dmi') sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/ears.dmi')
/obj/item/clothing/ears/attack_hand(mob/user as mob) /obj/item/clothing/ears/attack_hand(mob/user as mob)
if (!user) return if (!user) return
@@ -211,7 +211,7 @@ BLIND // can't see anything
var/see_invisible = -1 var/see_invisible = -1
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi', "Vox" = 'icons/mob/species/vox/eyes.dmi',
"Seromi" = 'icons/mob/species/seromi/eyes.dmi', "Teshari" = 'icons/mob/species/seromi/eyes.dmi',
) )
/obj/item/clothing/glasses/update_clothing_icon() /obj/item/clothing/glasses/update_clothing_icon()
@@ -236,7 +236,7 @@ BLIND // can't see anything
species_restricted = list("exclude","Unathi","Tajara", "Vox") species_restricted = list("exclude","Unathi","Tajara", "Vox")
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/gloves.dmi', "Vox" = 'icons/mob/species/vox/gloves.dmi',
"Seromi" = 'icons/mob/species/seromi/gloves.dmi', "Teshari" = 'icons/mob/species/seromi/gloves.dmi',
) )
/obj/item/clothing/gloves/update_clothing_icon() /obj/item/clothing/gloves/update_clothing_icon()
@@ -294,7 +294,7 @@ BLIND // can't see anything
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi', "Vox" = 'icons/mob/species/vox/head.dmi',
"Seromi" = 'icons/mob/species/seromi/head.dmi' "Teshari" = 'icons/mob/species/seromi/head.dmi'
) )
/obj/item/clothing/head/attack_self(mob/user) /obj/item/clothing/head/attack_self(mob/user)
@@ -393,7 +393,7 @@ BLIND // can't see anything
body_parts_covered = FACE|EYES body_parts_covered = FACE|EYES
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/masks.dmi', "Vox" = 'icons/mob/species/vox/masks.dmi',
"Seromi" = 'icons/mob/species/seromi/masks.dmi', "Teshari" = 'icons/mob/species/seromi/masks.dmi',
) )
var/voicechange = 0 var/voicechange = 0
@@ -426,10 +426,10 @@ BLIND // can't see anything
slowdown = SHOES_SLOWDOWN slowdown = SHOES_SLOWDOWN
force = 2 force = 2
var/overshoes = 0 var/overshoes = 0
species_restricted = list("exclude","Seromi", "Unathi","Tajara","Vox") species_restricted = list("exclude","Teshari", "Unathi","Tajara","Vox")
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/shoes.dmi', "Vox" = 'icons/mob/species/vox/shoes.dmi',
"Seromi" = 'icons/mob/species/seromi/shoes.dmi', "Teshari" = 'icons/mob/species/seromi/shoes.dmi',
) )
/obj/item/clothing/shoes/proc/draw_knife() /obj/item/clothing/shoes/proc/draw_knife()
@@ -504,7 +504,7 @@ BLIND // can't see anything
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi', "Vox" = 'icons/mob/species/vox/suit.dmi',
"Seromi" = 'icons/mob/species/seromi/suit.dmi' "Teshari" = 'icons/mob/species/seromi/suit.dmi'
) )
/obj/item/clothing/suit/update_clothing_icon() /obj/item/clothing/suit/update_clothing_icon()
@@ -540,7 +540,7 @@ BLIND // can't see anything
var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/uniform.dmi', "Vox" = 'icons/mob/species/vox/uniform.dmi',
"Seromi" = 'icons/mob/species/seromi/uniform.dmi' "Teshari" = 'icons/mob/species/seromi/uniform.dmi'
) )
//convenience var for defining the icon state for the overlay used when the clothing is worn. //convenience var for defining the icon state for the overlay used when the clothing is worn.

View File

@@ -11,7 +11,7 @@
icon_state = "petehat" icon_state = "petehat"
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi', "Vox" = 'icons/mob/species/vox/head.dmi',
"Seromi" = 'icons/mob/species/seromi/head.dmi' "Teshari" = 'icons/mob/species/seromi/head.dmi'
) )
/obj/item/clothing/head/collectable/slime /obj/item/clothing/head/collectable/slime

View File

@@ -4,7 +4,7 @@
icon = 'icons/obj/clothing/species/seromi/uniform.dmi' icon = 'icons/obj/clothing/species/seromi/uniform.dmi'
icon_state = "seromi_grey" icon_state = "seromi_grey"
worn_state = "seromi_grey" worn_state = "seromi_grey"
species_restricted = list("Seromi") species_restricted = list("Teshari")
/obj/item/clothing/under/seromi/white /obj/item/clothing/under/seromi/white
name = "small white smock" name = "small white smock"
@@ -24,7 +24,7 @@
/obj/item/clothing/under/seromi/medical /obj/item/clothing/under/seromi/medical
name = "small Medical uniform" name = "small Medical uniform"
icon_state = "seromi_medical" icon_state = "seromi_medical"
worn_state = "Seromi_medical" worn_state = "Teshari_medical"
/obj/item/clothing/under/seromi/rainbow /obj/item/clothing/under/seromi/rainbow
name = "small rainbow smock" name = "small rainbow smock"

View File

@@ -10,7 +10,7 @@ var/list/holder_mob_icon_cache = list()
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi', "Vox" = 'icons/mob/species/vox/head.dmi',
"Seromi" = 'icons/mob/species/seromi/head.dmi' "Teshari" = 'icons/mob/species/seromi/head.dmi'
) )
origin_tech = null origin_tech = null

View File

@@ -117,7 +117,7 @@
/datum/language/seromi /datum/language/seromi
name = "Schechi" name = "Schechi"
desc = "A trilling language spoken by the diminutive Seromi." desc = "A trilling language spoken by the diminutive Teshari."
speech_verb = "chirps" speech_verb = "chirps"
ask_verb = "chirrups" ask_verb = "chirrups"
exclaim_verb = "trills" exclaim_verb = "trills"

View File

@@ -1,6 +1,6 @@
/datum/species/seromi /datum/species/teshari
name = "Seromi" name = "Teshari"
name_plural = "Seromii" name_plural = "Tesharii"
blurb = "A race of feathered raptors who developed alongside the Skrell, inhabiting \ blurb = "A race of feathered raptors who developed alongside the Skrell, inhabiting \
the polar tundral regions outside of Skrell territory. Extremely fragile, they developed \ the polar tundral regions outside of Skrell territory. Extremely fragile, they developed \
hunting skills that emphasized taking out their prey without themselves getting hit. They \ hunting skills that emphasized taking out their prey without themselves getting hit. They \
@@ -83,7 +83,7 @@
var/hallucination_cap = 25 var/hallucination_cap = 25
// I'm... so... ronrery, so ronery... // I'm... so... ronrery, so ronery...
/datum/species/seromi/handle_environment_special(var/mob/living/carbon/human/H) /datum/species/teshari/handle_environment_special(var/mob/living/carbon/human/H)
// If they're dead or unconcious they're a bit beyond this kind of thing. // If they're dead or unconcious they're a bit beyond this kind of thing.
if(H.stat) if(H.stat)
@@ -106,7 +106,7 @@
if(H.shock_stage >= shock_cap && H.hallucination < hallucination_cap) if(H.shock_stage >= shock_cap && H.hallucination < hallucination_cap)
H.hallucination += 2.5 H.hallucination += 2.5
/datum/species/seromi/get_vision_flags(var/mob/living/carbon/human/H) /datum/species/teshari/get_vision_flags(var/mob/living/carbon/human/H)
if(!(H.sdisabilities & DEAF) && !H.ear_deaf) if(!(H.sdisabilities & DEAF) && !H.ear_deaf)
return SEE_SELF|SEE_MOBS return SEE_SELF|SEE_MOBS
else else

View File

@@ -61,20 +61,20 @@
name = "Short Hair 2" name = "Short Hair 2"
icon_state = "hair_shorthair3" icon_state = "hair_shorthair3"
Seromi Teshari
name = "Seromi Plumage" name = "Teshari Plumage"
icon_state = "seromi_default" icon_state = "seromi_default"
species_allowed = list("Seromi") species_allowed = list("Teshari")
Seromi_ears Teshari_ears
name = "Seromi Ears" name = "Teshari Ears"
icon_state = "seromi_ears" icon_state = "seromi_ears"
species_allowed = list("Seromi") species_allowed = list("Teshari")
Seromi_excited Teshari_excited
name = "Seromi Spiky" name = "Teshari Spiky"
icon_state = "seromi_spiky" icon_state = "seromi_spiky"
species_allowed = list("Seromi") species_allowed = list("Teshari")
cut cut
name = "Cut Hair" name = "Cut Hair"

View File

@@ -15,7 +15,7 @@ var/datum/robolimb/basic_robolimb
var/desc = "A generic unbranded robotic prosthesis." // Seen when examining a limb. var/desc = "A generic unbranded robotic prosthesis." // Seen when examining a limb.
var/icon = 'icons/mob/human_races/robotic.dmi' // Icon base to draw from. var/icon = 'icons/mob/human_races/robotic.dmi' // Icon base to draw from.
var/unavailable_at_chargen // If set, not available at chargen. var/unavailable_at_chargen // If set, not available at chargen.
var/list/species_cannot_use = list("Seromi") var/list/species_cannot_use = list("Teshari")
/datum/robolimb/bishop /datum/robolimb/bishop
company = "Bishop" company = "Bishop"