diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 54ca78aa39..d4633e3f07 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -174,7 +174,6 @@ w_class = 3.0 origin_tech = list(TECH_MATERIAL = 1) var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute - sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/handcuffs.dmi') /obj/item/weapon/caution desc = "Caution! Wet Floor!" diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index a27dd2d84b..1935455f94 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -11,7 +11,6 @@ var/global/list/obj/item/device/pda/PDAs = list() item_state = "electronic" w_class = 2.0 slot_flags = SLOT_ID | SLOT_BELT - sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/id.dmi') //Main variables var/owner = null diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index cc805cf95b..1915e5ec52 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -94,10 +94,6 @@ icon_state = "id" item_state = "card-id" - sprite_sheets = list( - "Resomi" = 'icons/mob/species/resomi/id.dmi' - ) - var/access = list() var/registered_name = "Unknown" // The name registered_name on the card slot_flags = SLOT_ID diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 03814de92c..09629e1ade 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -17,7 +17,6 @@ var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes var/cuff_sound = 'sound/weapons/handcuffs.ogg' var/cuff_type = "handcuffs" - sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/handcuffs.dmi') /obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 38ffaf20f7..431e30d1ca 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -17,9 +17,6 @@ slot_l_hand_str = "backpack", slot_r_hand_str = "backpack", ) - sprite_sheets = list( - "Resomi" = 'icons/mob/species/resomi/back.dmi' - ) w_class = 4 slot_flags = SLOT_BACK max_w_class = 3 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 4d4c9cb1e5..e83f18ff3a 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -6,7 +6,6 @@ item_state = "utility" slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined") - sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/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 a00cb019d4..d2deeda6d5 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -23,10 +23,6 @@ var/list/global/tank_gauge_cache = list() throw_speed = 1 throw_range = 4 - sprite_sheets = list( - "Resomi" = 'icons/mob/species/resomi/back.dmi' - ) - var/datum/gas_mixture/air_contents = null var/distribute_pressure = ONE_ATMOSPHERE var/integrity = 3 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 6f5615d7e1..feb9ee8d01 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -101,7 +101,6 @@ w_class = 1.0 throwforce = 2 slot_flags = SLOT_EARS - sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/ears.dmi') /obj/item/clothing/ears/attack_hand(mob/user as mob) if (!user) return @@ -209,10 +208,6 @@ BLIND // can't see anything var/vision_flags = 0 var/darkness_view = 0//Base human is 2 var/see_invisible = -1 - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Resomi" = 'icons/mob/species/resomi/eyes.dmi', - ) /obj/item/clothing/glasses/update_clothing_icon() if (ismob(src.loc)) @@ -235,8 +230,7 @@ BLIND // can't see anything attack_verb = list("challenged") species_restricted = list("exclude","Unathi","Tajara", "Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi', - "Resomi" = 'icons/mob/species/resomi/gloves.dmi', + "Vox" = 'icons/mob/species/vox/gloves.dmi' ) /obj/item/clothing/gloves/update_clothing_icon() @@ -293,8 +287,7 @@ BLIND // can't see anything var/on = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Resomi" = 'icons/mob/species/resomi/head.dmi' + "Vox" = 'icons/mob/species/vox/head.dmi' ) /obj/item/clothing/head/attack_self(mob/user) @@ -392,8 +385,7 @@ BLIND // can't see anything slot_flags = SLOT_MASK body_parts_covered = FACE|EYES sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/masks.dmi', - "Resomi" = 'icons/mob/species/resomi/masks.dmi', + "Vox" = 'icons/mob/species/vox/masks.dmi' ) var/voicechange = 0 @@ -428,8 +420,7 @@ BLIND // can't see anything var/overshoes = 0 species_restricted = list("exclude","Unathi","Tajara","Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/shoes.dmi', - "Resomi" = 'icons/mob/species/resomi/shoes.dmi', + "Vox" = 'icons/mob/species/vox/shoes.dmi' ) /obj/item/clothing/shoes/proc/draw_knife() @@ -503,8 +494,7 @@ BLIND // can't see anything w_class = 3 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Resomi" = 'icons/mob/species/resomi/suit.dmi' + "Vox" = 'icons/mob/species/vox/suit.dmi' ) /obj/item/clothing/suit/update_clothing_icon() @@ -537,8 +527,7 @@ BLIND // can't see anything var/displays_id = 1 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' + "Vox" = 'icons/mob/species/vox/uniform.dmi' ) //convenience var for defining the icon state for the overlay used when the clothing is worn. diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 35c48d58e7..89cd162d54 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -10,8 +10,7 @@ desc = "an ultra rare hat. It commands a certain respect." icon_state = "petehat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Resomi" = 'icons/mob/species/resomi/head.dmi' + "Vox" = 'icons/mob/species/vox/head.dmi' ) /obj/item/clothing/head/collectable/slime diff --git a/code/modules/clothing/under/xenos/resomi.dm b/code/modules/clothing/under/xenos/resomi.dm deleted file mode 100644 index 21c89ae129..0000000000 --- a/code/modules/clothing/under/xenos/resomi.dm +++ /dev/null @@ -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" \ No newline at end of file diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 39c8270c6a..3e8592e9d0 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -8,8 +8,7 @@ var/list/holder_mob_icon_cache = list() slot_flags = SLOT_HEAD | SLOT_HOLSTER sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Resomi" = 'icons/mob/species/resomi/head.dmi' + "Vox" = 'icons/mob/species/vox/head.dmi' ) origin_tech = null diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 24f455cee6..cc477f0ee7 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -114,25 +114,6 @@ new_name = pick(ai_names) return new_name -/datum/language/resomi - name = "Resomi" - desc = "A trilling language spoken by the diminutive Resomi." - speech_verb = "chirps" - ask_verb = "chirrups" - exclaim_verb = "trills" - colour = "alien" - key = "v" - flags = WHITELISTED - space_chance = 50 - syllables = list( - "ca", "ra", "ma", "sa", "na", "ta", "la", "sha", "scha", "a", "a", - "ce", "re", "me", "se", "ne", "te", "le", "she", "sche", "e", "e", - "ci", "ri", "mi", "si", "ni", "ti", "li", "shi", "schi", "i", "i" - ) - -/datum/language/resomi/get_random_name(gender) - return ..(gender, 1, 4, 1.5) - //Syllable Lists /* This list really long, mainly because I can't make up my mind about which mandarin syllables should be removed, diff --git a/code/modules/mob/living/carbon/human/species/station/resomi.dm b/code/modules/mob/living/carbon/human/species/station/resomi.dm deleted file mode 100644 index 238f022aab..0000000000 --- a/code/modules/mob/living/carbon/human/species/station/resomi.dm +++ /dev/null @@ -1,114 +0,0 @@ -/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." - - num_alternate_languages = 2 - secondary_langs = list("Resomi") - name_language = "Resomi" - - blood_color = "#D514F7" - flesh_color = "#5F7BB0" - base_color = "#001144" - tail = "resomitail" - 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' - - eyes = "eyes_resomi" - slowdown = -1 - total_health = 50 - brute_mod = 1.35 - burn_mod = 1.35 - mob_size = MOB_SMALL - holder_type = /obj/item/weapon/holder/human - short_sighted = 1 - gluttonous = 1 - - spawn_flags = CAN_JOIN | IS_WHITELISTED - appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR - bump_flag = MONKEY - swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL - push_flags = MONKEY|SLIME|SIMPLE_ANIMAL|ALIEN - - cold_level_1 = 180 - cold_level_2 = 130 - cold_level_3 = 70 - heat_level_1 = 320 - heat_level_2 = 370 - heat_level_3 = 600 - heat_discomfort_level = 292 - heat_discomfort_strings = list( - "Your feathers prickle in the heat.", - "You feel uncomfortably warm.", - ) - cold_discomfort_level = 180 - - has_limbs = list( - "chest" = list("path" = /obj/item/organ/external/chest), - "groin" = list("path" = /obj/item/organ/external/groin), - "head" = list("path" = /obj/item/organ/external/head), - "l_arm" = list("path" = /obj/item/organ/external/arm), - "r_arm" = list("path" = /obj/item/organ/external/arm/right), - "l_leg" = list("path" = /obj/item/organ/external/leg), - "r_leg" = list("path" = /obj/item/organ/external/leg/right), - "l_hand" = list("path" = /obj/item/organ/external/hand/resomi), - "r_hand" = list("path" = /obj/item/organ/external/hand/right/resomi), - "l_foot" = list("path" = /obj/item/organ/external/foot/resomi), - "r_foot" = list("path" = /obj/item/organ/external/foot/right/resomi) - ) - - has_organ = list( - "heart" = /obj/item/organ/heart, - "lungs" = /obj/item/organ/lungs, - "liver" = /obj/item/organ/liver, - "kidneys" = /obj/item/organ/kidneys, - "brain" = /obj/item/organ/brain, - "eyes" = /obj/item/organ/eyes - ) - - unarmed_types = list( - /datum/unarmed_attack/bite/sharp, - /datum/unarmed_attack/claws, - /datum/unarmed_attack/stomp/weak - ) - - var/shock_cap = 30 - var/hallucination_cap = 25 - -// I'm... so... ronrery, so ronery... -/datum/species/resomi/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) - return - - // No point processing if we're already stressing the hell out. - if(H.hallucination >= hallucination_cap && H.shock_stage >= shock_cap) - return - - // Check for company. - for(var/mob/living/M in viewers(H)) - if(M == H || M.stat == DEAD || M.invisibility > H.see_invisible) - continue - if(M.faction == "neutral" || M.faction == H.faction) - return - - // No company? Suffer :( - if(H.shock_stage < shock_cap) - H.shock_stage += 1 - 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) - if(!(H.sdisabilities & DEAF) && !H.ear_deaf) - return SEE_SELF|SEE_MOBS - else - return SEE_SELF diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index bf6c5883a5..ec6a38de92 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -61,21 +61,6 @@ name = "Short Hair 2" icon_state = "hair_shorthair3" - resomi - name = "Resomi Plumage" - icon_state = "resomi_default" - species_allowed = list("Resomi") - - resomi_ears - name = "Resomi Ears" - icon_state = "resomi_ears" - species_allowed = list("Resomi") - - resomi_excited - name = "Resomi Spiky" - icon_state = "resomi_spiky" - species_allowed = list("Resomi") - cut name = "Cut Hair" icon_state = "hair_c" diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index e046422b1b..774f7a5261 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -15,7 +15,7 @@ var/global/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() /datum/robolimb/bishop company = "Bishop Cybernetics" diff --git a/code/modules/organs/subtypes/resomi.dm b/code/modules/organs/subtypes/resomi.dm deleted file mode 100644 index f96cf75f03..0000000000 --- a/code/modules/organs/subtypes/resomi.dm +++ /dev/null @@ -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" diff --git a/icons/mob/human_races/r_resomi.dmi b/icons/mob/human_races/r_resomi.dmi deleted file mode 100644 index e370ec6b1c..0000000000 Binary files a/icons/mob/human_races/r_resomi.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/back.dmi b/icons/mob/species/resomi/back.dmi deleted file mode 100644 index 66455ffb3c..0000000000 Binary files a/icons/mob/species/resomi/back.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/belt.dmi b/icons/mob/species/resomi/belt.dmi deleted file mode 100644 index 19a4a78cd9..0000000000 Binary files a/icons/mob/species/resomi/belt.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/ears.dmi b/icons/mob/species/resomi/ears.dmi deleted file mode 100644 index 5ebdd8a5ee..0000000000 Binary files a/icons/mob/species/resomi/ears.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/eyes.dmi b/icons/mob/species/resomi/eyes.dmi deleted file mode 100644 index 17a41de747..0000000000 Binary files a/icons/mob/species/resomi/eyes.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/gloves.dmi b/icons/mob/species/resomi/gloves.dmi deleted file mode 100644 index 7ff6c97e69..0000000000 Binary files a/icons/mob/species/resomi/gloves.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/handcuffs.dmi b/icons/mob/species/resomi/handcuffs.dmi deleted file mode 100644 index 12b35d4e9c..0000000000 Binary files a/icons/mob/species/resomi/handcuffs.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/head.dmi b/icons/mob/species/resomi/head.dmi deleted file mode 100644 index 54ebad32d4..0000000000 Binary files a/icons/mob/species/resomi/head.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/id.dmi b/icons/mob/species/resomi/id.dmi deleted file mode 100644 index fb4d5b6e58..0000000000 Binary files a/icons/mob/species/resomi/id.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/masks.dmi b/icons/mob/species/resomi/masks.dmi deleted file mode 100644 index 8742285ed3..0000000000 Binary files a/icons/mob/species/resomi/masks.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/shoes.dmi b/icons/mob/species/resomi/shoes.dmi deleted file mode 100644 index f901a71cb8..0000000000 Binary files a/icons/mob/species/resomi/shoes.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/suit.dmi b/icons/mob/species/resomi/suit.dmi deleted file mode 100644 index 2f1ff6cb71..0000000000 Binary files a/icons/mob/species/resomi/suit.dmi and /dev/null differ diff --git a/icons/mob/species/resomi/uniform.dmi b/icons/mob/species/resomi/uniform.dmi deleted file mode 100644 index b60322d498..0000000000 Binary files a/icons/mob/species/resomi/uniform.dmi and /dev/null differ diff --git a/icons/obj/clothing/species/resomi/uniform.dmi b/icons/obj/clothing/species/resomi/uniform.dmi deleted file mode 100644 index 817b3863cf..0000000000 Binary files a/icons/obj/clothing/species/resomi/uniform.dmi and /dev/null differ diff --git a/polaris.dme b/polaris.dme index 85b53114e9..9638bf2c48 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1104,7 +1104,6 @@ #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\resomi.dm" #include "code\modules\customitems\item_spawning.dm" #include "code\modules\detectivework\footprints.dm" #include "code\modules\detectivework\forensics.dm" @@ -1375,7 +1374,6 @@ #include "code\modules\mob\living\carbon\human\species\outsider\vox.dm" #include "code\modules\mob\living\carbon\human\species\station\golem.dm" #include "code\modules\mob\living\carbon\human\species\station\monkey.dm" -#include "code\modules\mob\living\carbon\human\species\station\resomi.dm" #include "code\modules\mob\living\carbon\human\species\station\slime.dm" #include "code\modules\mob\living\carbon\human\species\station\station.dm" #include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_embryo.dm" @@ -1541,7 +1539,6 @@ #include "code\modules\organs\wound.dm" #include "code\modules\organs\subtypes\diona.dm" #include "code\modules\organs\subtypes\machine.dm" -#include "code\modules\organs\subtypes\resomi.dm" #include "code\modules\organs\subtypes\standard.dm" #include "code\modules\organs\subtypes\unbreakable.dm" #include "code\modules\organs\subtypes\xenos.dm"