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

Renaming Resomi to Seromi.

Browse Source
This commit is contained in:
Zuhayr
2016-01-27 14:24:09 +10:30
parent 2082aee611
commit 58736fb4f6
42 changed files with 105 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+9 -9
View File
@@ -101,7 +101,7 @@
w_class = 1.0
throwforce = 2
slot_flags = SLOT_EARS
sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/ears.dmi')
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/ears.dmi')
/obj/item/clothing/ears/attack_hand(mob/user as mob)
if (!user) return
@@ -211,7 +211,7 @@ BLIND // can't see anything
var/see_invisible = -1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Resomi" = 'icons/mob/species/resomi/eyes.dmi',
"Seromi" = 'icons/mob/species/seromi/eyes.dmi',
)
/obj/item/clothing/glasses/update_clothing_icon()
@@ -236,7 +236,7 @@ BLIND // can't see anything
species_restricted = list("exclude","Unathi","Tajara", "Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/gloves.dmi',
"Resomi" = 'icons/mob/species/resomi/gloves.dmi',
"Seromi" = 'icons/mob/species/seromi/gloves.dmi',
)
/obj/item/clothing/gloves/update_clothing_icon()
@@ -294,7 +294,7 @@ BLIND // can't see anything
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Resomi" = 'icons/mob/species/resomi/head.dmi'
"Seromi" = 'icons/mob/species/seromi/head.dmi'
)
/obj/item/clothing/head/attack_self(mob/user)
@@ -393,7 +393,7 @@ BLIND // can't see anything
body_parts_covered = FACE|EYES
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/masks.dmi',
"Resomi" = 'icons/mob/species/resomi/masks.dmi',
"Seromi" = 'icons/mob/species/seromi/masks.dmi',
)
var/voicechange = 0
@@ -426,10 +426,10 @@ BLIND // can't see anything
slowdown = SHOES_SLOWDOWN
force = 2
var/overshoes = 0
species_restricted = list("exclude","Unathi","Tajara","Vox")
species_restricted = list("exclude","Seromi", "Unathi","Tajara","Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/shoes.dmi',
"Resomi" = 'icons/mob/species/resomi/shoes.dmi',
"Seromi" = 'icons/mob/species/seromi/shoes.dmi',
)
/obj/item/clothing/shoes/proc/draw_knife()
@@ -504,7 +504,7 @@ BLIND // can't see anything
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Resomi" = 'icons/mob/species/resomi/suit.dmi'
"Seromi" = 'icons/mob/species/seromi/suit.dmi'
)
/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
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/uniform.dmi',
"Resomi" = 'icons/mob/species/resomi/uniform.dmi'
"Seromi" = 'icons/mob/species/seromi/uniform.dmi'
)
//convenience var for defining the icon state for the overlay used when the clothing is worn.
code/modules/clothing/head/collectable.dm
+1 -1
View File
@@ -11,7 +11,7 @@
icon_state = "petehat"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Resomi" = 'icons/mob/species/resomi/head.dmi'
"Seromi" = 'icons/mob/species/seromi/head.dmi'
)
/obj/item/clothing/head/collectable/slime
code/modules/clothing/under/xenos/resomi.dm
-32
View File
@@ -1,32 +0,0 @@
/obj/item/clothing/under/resomi
name = "small grey smock"
desc = "It looks fitted to nonhuman proportions."
icon = 'icons/obj/clothing/species/resomi/uniform.dmi'
icon_state = "resomi_grey"
worn_state = "resomi_grey"
species_restricted = list("Resomi")
/obj/item/clothing/under/resomi/white
name = "small white smock"
icon_state = "resomi_white"
worn_state = "resomi_white"
/obj/item/clothing/under/resomi/red
name = "small Security smock"
icon_state = "resomi_red"
worn_state = "resomi_red"
/obj/item/clothing/under/resomi/yellow
name = "small Engineering smock"
icon_state = "resomi_yellow"
worn_state = "resomi_yellow"
/obj/item/clothing/under/resomi/medical
name = "small Medical uniform"
icon_state = "resomi_medical"
worn_state = "resomi_medical"
/obj/item/clothing/under/resomi/rainbow
name = "small rainbow smock"
icon_state = "resomi_rainbow"
worn_state = "resomi_rainbow"
code/modules/clothing/under/xenos/seromi.dm
+32
View File
@@ -0,0 +1,32 @@
/obj/item/clothing/under/seromi
name = "small grey smock"
desc = "It looks fitted to nonhuman proportions."
icon = 'icons/obj/clothing/species/seromi/uniform.dmi'
icon_state = "seromi_grey"
worn_state = "seromi_grey"
species_restricted = list("Seromi")
/obj/item/clothing/under/seromi/white
name = "small white smock"
icon_state = "seromi_white"
worn_state = "seromi_white"
/obj/item/clothing/under/seromi/red
name = "small Security smock"
icon_state = "seromi_red"
worn_state = "seromi_red"
/obj/item/clothing/under/seromi/yellow
name = "small Engineering smock"
icon_state = "seromi_yellow"
worn_state = "seromi_yellow"
/obj/item/clothing/under/seromi/medical
name = "small Medical uniform"
icon_state = "seromi_medical"
worn_state = "Seromi_medical"
/obj/item/clothing/under/seromi/rainbow
name = "small rainbow smock"
icon_state = "seromi_rainbow"
worn_state = "seromi_rainbow"
code/modules/mob/holder.dm
+1 -1
View File
@@ -10,7 +10,7 @@ var/list/holder_mob_icon_cache = list()
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Resomi" = 'icons/mob/species/resomi/head.dmi'
"Seromi" = 'icons/mob/species/seromi/head.dmi'
)
origin_tech = null
code/modules/mob/language/station.dm
+4 -4
View File
@@ -115,9 +115,9 @@
else
return pick(ai_names)
/datum/language/resomi
name = "Resomi"
desc = "A trilling language spoken by the diminutive Resomi."
/datum/language/seromi
name = "Schechi"
desc = "A trilling language spoken by the diminutive Seromi."
speech_verb = "chirps"
ask_verb = "chirrups"
exclaim_verb = "trills"
@@ -131,7 +131,7 @@
"ci", "ri", "mi", "si", "ni", "ti", "li", "shi", "schi", "i", "i"
)
/datum/language/resomi/get_random_name(gender)
/datum/language/seromi/get_random_name(gender)
return ..(gender, 1, 4, 1.5)
//Syllable Lists
code/modules/mob/living/carbon/human/species/station/resomi.dm → code/modules/mob/living/carbon/human/species/station/seromi.dm
+22 -22
View File
@@ -1,26 +1,26 @@
/datum/species/resomi
name = "Resomi"
name_plural = "Resomii"
blurb = "A race of feathered raptors who developed on a cold world, almost \
outside of the Goldilocks zone. Extremely fragile, they developed hunting skills \
that emphasized taking out their prey without themselves getting hit. They are an \
advanced post-scarcity culture on good terms with Skrellian and Human interests."
/datum/species/seromi
name = "Seromi"
name_plural = "Seromii"
blurb = "A race of feathered raptors who developed alongside the Skrell, inhabiting \
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 \
are only recently becoming known in human space after reaching space with Skrell assistance."
num_alternate_languages = 2
secondary_langs = list("Resomi")
name_language = "Resomi"
secondary_langs = list("Schechi")
name_language = "Schechi"
blood_color = "#D514F7"
flesh_color = "#5F7BB0"
base_color = "#001144"
tail = "resomitail"
tail = "seromitail"
tail_hair = "feathers"
icobase = 'icons/mob/human_races/r_resomi.dmi'
deform = 'icons/mob/human_races/r_resomi.dmi'
damage_overlays = 'icons/mob/human_races/masks/dam_resomi.dmi'
damage_mask = 'icons/mob/human_races/masks/dam_mask_resomi.dmi'
blood_mask = 'icons/mob/human_races/masks/blood_resomi.dmi'
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'
slowdown = -1
total_health = 50
@@ -53,15 +53,15 @@
has_limbs = list(
BP_CHEST = 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/resomi),
BP_HEAD = list("path" = /obj/item/organ/external/head/seromi),
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/resomi),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/resomi),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/resomi),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/resomi)
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)
)
has_organ = list(
@@ -83,7 +83,7 @@
var/hallucination_cap = 25
// I'm... so... ronrery, so ronery...
/datum/species/resomi/handle_environment_special(var/mob/living/carbon/human/H)
/datum/species/seromi/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(H.stat)
@@ -106,7 +106,7 @@
if(H.shock_stage >= shock_cap && H.hallucination < hallucination_cap)
H.hallucination += 2.5
/datum/species/resomi/get_vision_flags(var/mob/living/carbon/human/H)
/datum/species/seromi/get_vision_flags(var/mob/living/carbon/human/H)
if(!(H.sdisabilities & DEAF) && !H.ear_deaf)
return SEE_SELF|SEE_MOBS
else
code/modules/mob/living/simple_animal/friendly/mushroom.dm
View File
code/modules/mob/new_player/sprite_accessories.dm
+12 -12
View File
@@ -61,20 +61,20 @@
name = "Short Hair 2"
icon_state = "hair_shorthair3"
resomi
name = "Resomi Plumage"
icon_state = "resomi_default"
species_allowed = list("Resomi")
Seromi
name = "Seromi Plumage"
icon_state = "seromi_default"
species_allowed = list("Seromi")
resomi_ears
name = "Resomi Ears"
icon_state = "resomi_ears"
species_allowed = list("Resomi")
Seromi_ears
name = "Seromi Ears"
icon_state = "seromi_ears"
species_allowed = list("Seromi")
resomi_excited
name = "Resomi Spiky"
icon_state = "resomi_spiky"
species_allowed = list("Resomi")
Seromi_excited
name = "Seromi Spiky"
icon_state = "seromi_spiky"
species_allowed = list("Seromi")
cut
name = "Cut Hair"
code/modules/organs/organ_external.dm
+2 -2
View File
@@ -1333,8 +1333,8 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/head/skrell
eye_icon = "skrell_eyes_s"
/obj/item/organ/external/head/resomi
eye_icon = "eyes_resomi"
/obj/item/organ/external/head/seromi
eye_icon = "eyes_seromi"
/obj/item/organ/external/head/vox
eye_icon = "vox_eyes_s"
code/modules/organs/robolimbs.dm
+1 -1
View File
@@ -15,7 +15,7 @@ var/datum/robolimb/basic_robolimb
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/unavailable_at_chargen // If set, not available at chargen.
var/list/species_cannot_use = list("Resomi")
var/list/species_cannot_use = list("Seromi")
/datum/robolimb/bishop
company = "Bishop"
code/modules/organs/subtypes/resomi.dm
-8
View File
@@ -1,8 +0,0 @@
/obj/item/organ/external/foot/resomi
body_hair = "feathers"
/obj/item/organ/external/foot/right/resomi
body_hair = "feathers"
/obj/item/organ/external/hand/resomi
body_hair = "feathers"
/obj/item/organ/external/hand/right/resomi
body_hair = "feathers"
code/modules/organs/subtypes/seromi.dm
+8
View File
@@ -0,0 +1,8 @@
/obj/item/organ/external/foot/seromi
body_hair = "feathers"
/obj/item/organ/external/foot/right/seromi
body_hair = "feathers"
/obj/item/organ/external/hand/seromi
body_hair = "feathers"
/obj/item/organ/external/hand/right/seromi
body_hair = "feathers"