From 1d0eadcb126fc3581eed33490f4be2a88157af58 Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Fri, 1 Apr 2022 21:07:46 -0400 Subject: [PATCH] Kapulimbs (#65523) * i wanna go to bed so im pushing this * It compiles but doesn't work yet * It works! * I WANT TO DIE * Appease linters * some CI fixes * Address reviews + oversight * Limb grower fix * more icon fixes * forgot to hit save * I'm a dumbass * Removes bodypart parent from unit test * Fixes monkeys and CI * Grammar pass * I hate zombie code so much * General code cleanup * THE SHITCODERS ARE COMING FOR MY VARS * THE UNIT TESTS ARE COMING FOR MY SHITCODE * Reviews + skirts * Removes an unused DMI * Why didn't I do this in the first place? * HAIR REFACTOR * Haha whoops * How did I miss this * Admin spawned creatures now have their features * Optimize me harder * minor fix i need to push to merge master * Fixes hair (maybe) and a runtime * Maybe fixes mirrors * Attempts to fix women * Fixes hair on dismembered heads and a grammar change * Caps lock did me dirty * address reviews * icon failures fix + missed reviews * Fixes: Facehuggers and Regenerate_limb * Fixes ethereal color pref appearance * How the fuck did this not break everything else horribly? * JESUS FUCKING CHRIST IM A MORON * Fixes compile * I'm not high I swear * Im a dipshiiiit * grumble grumble * Fixes a visual bug with digitigrade legs. Adds \improper to roundstart species names. Added two new clothing-related helper procs. Renamed a couple procs to be more accurate. Adds SHOULD_CALL_PARENT(TRUE) to examine_more. Addresses reviews. * Forgot this little readability thing. * Updates CODEOWNERS * Me when I forget how github works * mapload me harder * Last second fixes --- .github/CODEOWNERS | 5 + code/__DEFINES/DNA.dm | 82 +-- code/__DEFINES/bodyparts.dm | 2 + code/__DEFINES/inventory.dm | 14 +- code/__DEFINES/mobs.dm | 59 +- code/__DEFINES/species_clothing_paths.dm | 15 + code/__HELPERS/bodyparts.dm | 1 + code/__HELPERS/icons.dm | 23 + code/__HELPERS/type2type.dm | 8 +- code/__HELPERS/type_processing.dm | 1 + code/_globalvars/bitfields.dm | 15 + code/_globalvars/phobias.dm | 1 - code/datums/brain_damage/phobia.dm | 4 +- code/datums/components/bloodysoles.dm | 2 +- code/datums/components/caltrop.dm | 2 +- code/datums/components/creamed.dm | 4 +- code/datums/components/surgery_initiator.dm | 6 +- code/datums/components/unbreakable.dm | 2 +- code/datums/diseases/advance/symptoms/fire.dm | 8 +- .../diseases/advance/symptoms/flesh_eating.dm | 4 +- code/datums/diseases/advance/symptoms/heal.dm | 22 +- .../diseases/advance/symptoms/itching.dm | 2 +- code/datums/dna.dm | 12 +- code/datums/mutations/body.dm | 2 +- code/datums/wounds/_wounds.dm | 2 +- code/datums/wounds/bones.dm | 80 +-- code/datums/wounds/scars/_scars.dm | 2 +- code/game/atoms.dm | 3 + code/game/machinery/computer/arcade/arcade.dm | 17 +- code/game/machinery/limbgrower.dm | 40 +- code/game/objects/effects/contraband.dm | 30 +- code/game/objects/items.dm | 2 + code/game/objects/items/cards_ids.dm | 29 +- code/game/objects/items/crayons.dm | 2 +- .../items/devices/scanners/health_analyzer.dm | 2 +- code/game/objects/items/food/misc.dm | 11 +- code/game/objects/items/food/moth.dm | 37 +- code/game/objects/items/hand_items.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 12 +- code/game/objects/items/stacks/medical.dm | 9 +- code/game/objects/items/storage/book.dm | 9 +- code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/structures/mirror.dm | 6 +- code/modules/admin/create_mob.dm | 7 +- .../abductor/equipment/glands/heal.dm | 6 +- .../antagonists/changeling/changeling.dm | 6 +- .../changeling/powers/fakedeath.dm | 2 +- .../changeling/powers/regenerate.dm | 2 +- .../antagonists/fugitive/fugitive_outfits.dm | 12 - .../heretic/structures/mawed_crucible.dm | 2 +- .../nightmare/nightmare_species.dm | 2 +- .../revenant/revenant_abilities.dm | 3 +- .../antagonists/revenant/revenant_blight.dm | 4 +- code/modules/antagonists/thief/thief.dm | 2 +- .../awaymissions/mission_code/snowdin.dm | 6 +- code/modules/capture_the_flag/ctf_game.dm | 3 +- code/modules/client/preferences.dm | 6 +- code/modules/client/preferences/body_type.dm | 4 +- code/modules/client/preferences/species.dm | 2 +- .../preferences/species_features/basic.dm | 10 +- .../preferences/species_features/ethereal.dm | 8 +- code/modules/clothing/clothing.dm | 6 +- code/modules/clothing/under/_under.dm | 7 +- code/modules/clothing/under/jobs/cargo.dm | 6 +- .../clothing/under/jobs/civilian/civilian.dm | 13 + .../under/jobs/civilian/clown_mime.dm | 1 + .../clothing/under/jobs/civilian/curator.dm | 1 + code/modules/clothing/under/jobs/command.dm | 1 + .../clothing/under/jobs/engineering.dm | 3 + code/modules/clothing/under/jobs/medical.dm | 6 + code/modules/clothing/under/jobs/rnd.dm | 6 + code/modules/clothing/under/jobs/security.dm | 7 + code/modules/clothing/under/shorts.dm | 2 +- code/modules/clothing/under/skirt_dress.dm | 1 + code/modules/clothing/under/suits.dm | 3 + code/modules/clothing/under/syndicate.dm | 2 + code/modules/games/wizoff.dm | 21 +- code/modules/jobs/job_types/_job.dm | 2 +- .../living/carbon/alien/special/facehugger.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 60 +- .../mob/living/carbon/carbon_defense.dm | 6 +- .../mob/living/carbon/carbon_defines.dm | 3 +- .../mob/living/carbon/carbon_update_icons.dm | 151 ++-- .../modules/mob/living/carbon/damage_procs.dm | 8 +- code/modules/mob/living/carbon/examine.dm | 20 +- code/modules/mob/living/carbon/human/dummy.dm | 2 +- .../mob/living/carbon/human/examine.dm | 11 +- code/modules/mob/living/carbon/human/human.dm | 13 +- .../mob/living/carbon/human/human_defense.dm | 6 +- .../mob/living/carbon/human/human_defines.dm | 2 +- .../living/carbon/human/human_update_icons.dm | 677 +++++++++++------- .../mob/living/carbon/human/inventory.dm | 6 +- .../mob/living/carbon/human/species.dm | 282 ++------ .../carbon/human/species_types/abductors.dm | 9 + .../carbon/human/species_types/android.dm | 39 +- .../carbon/human/species_types/dullahan.dm | 3 +- .../carbon/human/species_types/ethereal.dm | 23 +- .../carbon/human/species_types/felinid.dm | 2 +- .../carbon/human/species_types/flypeople.dm | 11 +- .../carbon/human/species_types/golems.dm | 91 ++- .../carbon/human/species_types/humans.dm | 2 +- .../carbon/human/species_types/jellypeople.dm | 27 +- .../human/species_types/lizardpeople.dm | 21 +- .../carbon/human/species_types/monkeys.dm | 6 +- .../carbon/human/species_types/mothmen.dm | 11 +- .../carbon/human/species_types/mushpeople.dm | 9 + .../carbon/human/species_types/plasmamen.dm | 13 +- .../carbon/human/species_types/podpeople.dm | 13 +- .../human/species_types/shadowpeople.dm | 13 +- .../carbon/human/species_types/skeletons.dm | 9 + .../carbon/human/species_types/snail.dm | 9 + .../carbon/human/species_types/synths.dm | 142 ---- .../carbon/human/species_types/vampire.dm | 4 +- .../carbon/human/species_types/zombies.dm | 54 +- code/modules/mob/living/carbon/inventory.dm | 33 + code/modules/mob/living/carbon/life.dm | 12 +- code/modules/mob/living/living.dm | 4 +- code/modules/mob/mob_helpers.dm | 4 +- .../mob_spawn/corpses/mining_corpses.dm | 2 +- .../energy_net_nets.dm | 8 +- .../suit/ninja_equipment_actions/ninja_net.dm | 2 +- code/modules/ninja/suit/suit.dm | 2 +- code/modules/power/cable.dm | 2 +- .../chemistry/reagents/drug_reagents.dm | 4 +- .../chemistry/reagents/medicine_reagents.dm | 12 +- .../chemistry/reagents/toxin_reagents.dm | 2 +- .../reagents/reagent_containers/patch.dm | 2 +- code/modules/religion/religion_sects.dm | 19 +- .../research/designs/limbgrower_designs.dm | 50 +- .../modules/spells/spell_types/shadow_walk.dm | 2 +- code/modules/surgery/bodyparts/_bodyparts.dm | 554 +++++--------- .../surgery/bodyparts/dismemberment.dm | 86 +-- code/modules/surgery/bodyparts/head.dm | 255 +++++-- code/modules/surgery/bodyparts/helpers.dm | 85 +-- code/modules/surgery/bodyparts/parts.dm | 48 +- .../surgery/bodyparts/robot_bodyparts.dm | 70 +- .../species_parts/ethereal_bodyparts.dm | 31 + .../species_parts/lizard_bodyparts.dm | 77 ++ .../bodyparts/species_parts/misc_bodyparts.dm | 422 +++++++++++ .../bodyparts/species_parts/moth_bodyparts.dm | 30 + .../species_parts/plasmaman_bodyparts.dm | 31 + code/modules/surgery/bodyparts/wounds.dm | 209 ++++++ code/modules/surgery/implant_removal.dm | 2 +- code/modules/surgery/limb_augmentation.dm | 9 +- code/modules/surgery/organ_manipulation.dm | 2 +- .../organs/external/_external_organs.dm | 4 +- code/modules/surgery/organs/heart.dm | 2 +- .../modules/surgery/prosthetic_replacement.dm | 7 +- code/modules/surgery/surgery.dm | 2 +- code/modules/unit_tests/create_and_destroy.dm | 2 + code/modules/vending/_vending.dm | 2 +- code/modules/zombie/organs.dm | 35 +- icons/mob/augmentation/augments.dmi | Bin 2145 -> 2149 bytes icons/mob/augmentation/augments_engineer.dmi | Bin 1818 -> 1825 bytes icons/mob/augmentation/augments_mining.dmi | Bin 1851 -> 2006 bytes icons/mob/augmentation/augments_security.dmi | Bin 1780 -> 1787 bytes icons/mob/augmentation/surplus_augments.dmi | Bin 1155 -> 1162 bytes icons/mob/clothing/under/cargo.dmi | Bin 4870 -> 4698 bytes icons/mob/clothing/under/shorts_pants.dmi | Bin 5118 -> 4322 bytes icons/mob/human_parts.dmi | Bin 61173 -> 53101 bytes icons/mob/human_parts_greyscale.dmi | Bin 50154 -> 37088 bytes icons/mob/species/ethereal/bodyparts.dmi | Bin 0 -> 6033 bytes icons/mob/species/lizard/bodyparts.dmi | Bin 0 -> 1378 bytes icons/mob/species/misc/digitigrade.dmi | Bin 0 -> 1971 bytes icons/mob/species/moth/bodyparts.dmi | Bin 0 -> 1307 bytes icons/mob/species/plasmaman/bodyparts.dmi | Bin 0 -> 2890 bytes tgstation.dme | 10 +- 167 files changed, 2827 insertions(+), 1836 deletions(-) create mode 100644 code/__DEFINES/bodyparts.dm create mode 100644 code/__DEFINES/species_clothing_paths.dm create mode 100644 code/__HELPERS/bodyparts.dm delete mode 100644 code/modules/mob/living/carbon/human/species_types/synths.dm create mode 100644 code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm create mode 100644 code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm create mode 100644 code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm create mode 100644 code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm create mode 100644 code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm create mode 100644 code/modules/surgery/bodyparts/wounds.dm create mode 100644 icons/mob/species/ethereal/bodyparts.dmi create mode 100644 icons/mob/species/lizard/bodyparts.dmi create mode 100644 icons/mob/species/misc/digitigrade.dmi create mode 100644 icons/mob/species/moth/bodyparts.dmi create mode 100644 icons/mob/species/plasmaman/bodyparts.dmi diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 02ab7276b76..f0318787368 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -109,6 +109,11 @@ /code/modules/mob/living/simple_animal/bot/ @JohnFulpWillard /goon/ @JohnFulpWillard +# Kapu1178 + +/code/modules/surgery/bodyparts @Kapu1178 +/code/modules/mob/living/carbon/carbon_update_icons.dm @Kapu1178 + # MrStonedOne /SQL/database_changelog.txt @MrStonedOne diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index f91b3b518c9..ce088f99880 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -68,30 +68,28 @@ #define NOBLOOD 6 #define NOTRANSSTING 7 #define NOZOMBIE 8 -/// Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi) -#define DIGITIGRADE 9 -#define NO_UNDERWEAR 10 -#define NOSTOMACH 11 -#define NO_DNA_COPY 12 -#define DRINKSBLOOD 13 +#define NO_UNDERWEAR 9 +#define NOSTOMACH 10 +#define NO_DNA_COPY 11 +#define DRINKSBLOOD 12 /// Use this if you want to change the race's color without the player being able to pick their own color. AKA special color shifting -#define DYNCOLORS 14 -#define AGENDER 15 +#define DYNCOLORS 13 +#define AGENDER 14 /// Do not draw eyes or eyeless overlay -#define NOEYESPRITES 16 +#define NOEYESPRITES 15 /// Used for determining which wounds are applicable to this species. /// if we have flesh (can suffer slash/piercing/burn wounds, requires they don't have NOBLOOD) -#define HAS_FLESH 17 +#define HAS_FLESH 16 /// if we have bones (can suffer bone wounds) -#define HAS_BONE 18 +#define HAS_BONE 17 ///If we have a limb-specific overlay sprite -#define HAS_MARKINGS 19 +#define HAS_MARKINGS 18 /// Do not draw blood overlay -#define NOBLOODOVERLAY 20 +#define NOBLOODOVERLAY 19 ///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png -#define NOAUGMENTS 21 +#define NOAUGMENTS 20 ///will be assigned a universal vampire themed last name shared by their department. this is preferenced! -#define BLOOD_CLANS 22 +#define BLOOD_CLANS 21 //organ slots #define ORGAN_SLOT_ADAMANTINE_RESONATOR "adamantine_resonator" @@ -149,7 +147,7 @@ #define CHROMOSOME_NONE 1 #define CHROMOSOME_USED 2 -//used for mob's genetic gender (mainly just for pronouns, members of sexed species with plural gender refer to their body_type for the actual sprites, which is not genetic) +//used for mob's genetic gender (mainly just for pronouns, members of sexed species with plural gender refer to their physique for the actual sprites, which is not genetic) #define G_MALE 1 #define G_FEMALE 2 #define G_PLURAL 3 @@ -187,42 +185,10 @@ GLOBAL_LIST_INIT(organ_process_order, list( ORGAN_SLOT_XENO_NEUROTOXINGLAND, ORGAN_SLOT_XENO_EGGSAC,)) -//Defines for Species IDs -#define SPECIES_HUMAN "human" -#define SPECIES_FELINE "felinid" -#define SPECIES_MOTH "moth" -#define SPECIES_ETHEREAL "ethereal" -#define SPECIES_PLASMAMAN "plasmaman" -#define SPECIES_FLY "fly" -#define SPECIES_MONKEY "monkey" -#define SPECIES_JELLYPERSON "jelly" -#define SPECIES_SLIMEPERSON "slime" -#define SPECIES_LUMINESCENT "lum" -#define SPECIES_STARGAZER "stargazer" -#define SPECIES_LIZARD "lizard" -#define SPECIES_LIZARD_ASH "ashlizard" -#define SPECIES_LIZARD_SILVER "silverlizard" -#define SPECIES_DULLAHAN "dullahan" -#define SPECIES_SKELETON "skeleton" -#define SPECIES_VAMPIRE "vampire" -#define SPECIES_ZOMBIE "memezombies" -#define SPECIES_ZOMBIE_HALLOWEEN "zombie" -#define SPECIES_ADDICT "goofzombies" - -#define SPECIES_ABDUCTOR "abductor" -#define SPECIES_ANDROID "android" -#define SPECIES_MUSHROOM "mush" -#define SPECIES_PODPERSON "pod" -#define SPECIES_SHADOW "shadow" -#define SPECIES_NIGHTMARE "nightmare" -#define SPECIES_SNAIL "snail" -#define SPECIES_SYNTH "synth" -#define SPECIES_SYNTH_MILITARY "military_synth" - //Defines for Golem Species IDs -#define SPECIES_GOLEM "iron_golem" -#define SPECIES_GOLEM_ADAMANTINE "adamantine_golem" -#define SPECIES_GOLEM_PLASMA "plasma_golem" +#define SPECIES_GOLEM "golem" +#define SPECIES_GOLEM_ADAMANTINE "a_golem" +#define SPECIES_GOLEM_PLASMA "p_golem" #define SPECIES_GOLEM_DIAMOND "diamond_golem" #define SPECIES_GOLEM_GOLD "gold_golem" #define SPECIES_GOLEM_SILVER "silver_golem" @@ -235,16 +201,16 @@ GLOBAL_LIST_INIT(organ_process_order, list( #define SPECIES_GOLEM_SAND "sand_golem" #define SPECIES_GOLEM_GLASS "glass_golem" #define SPECIES_GOLEM_BLUESPACE "bluespace_golem" -#define SPECIES_GOLEM_BANANIUM "bananium_golem" -#define SPECIES_GOLEM_CULT "runic_golem" -#define SPECIES_GOLEM_CLOTH "cloth_golem" +#define SPECIES_GOLEM_BANANIUM "ba_golem" +#define SPECIES_GOLEM_CULT "cultgolem" +#define SPECIES_GOLEM_CLOTH "clothgolem" #define SPECIES_GOLEM_PLASTIC "plastic_golem" #define SPECIES_GOLEM_BRONZE "bronze_golem" -#define SPECIES_GOLEM_CARDBOARD "cardboard_golem" +#define SPECIES_GOLEM_CARDBOARD "c_golem" #define SPECIES_GOLEM_LEATHER "leather_golem" -#define SPECIES_GOLEM_DURATHREAD "durathread_golem" -#define SPECIES_GOLEM_BONE "bone_golem" -#define SPECIES_GOLEM_SNOW "snow_golem" +#define SPECIES_GOLEM_DURATHREAD "d_golem" +#define SPECIES_GOLEM_BONE "b_golem" +#define SPECIES_GOLEM_SNOW "sn_golem" #define SPECIES_GOLEM_HYDROGEN "metallic_hydrogen_golem" // Defines for used in creating "perks" for the species preference pages. diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm new file mode 100644 index 00000000000..5c575184273 --- /dev/null +++ b/code/__DEFINES/bodyparts.dm @@ -0,0 +1,2 @@ +///The standard amount of bodyparts a carbon has. Currently 6, HEAD/L_ARM/R_ARM/CHEST/L_LEG/R_LEG +#define BODYPARTS_DEFAULT_MAXIMUM 6 diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index b3dfa80cb8c..7ad02ab4525 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -125,13 +125,13 @@ #define ALT_STYLE 1 #define DIGITIGRADE_STYLE 2 -//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts -#define NO_MUTANTRACE_VARIATION 0 -#define MUTANTRACE_VARIATION 1 - -#define NOT_DIGITIGRADE 0 -#define FULL_DIGITIGRADE 1 -#define SQUISHED_DIGITIGRADE 2 +//Flags (actual flags, fucker ^) for /obj/item/var/supports_variations_flags +///No alternative sprites based on bodytype +#define CLOTHING_NO_VARIATION (1<<0) +///Has a sprite for digitigrade legs specifically. +#define CLOTHING_DIGITIGRADE_VARIATION (1<<1) +///The sprite works fine for digitigrade legs as-is. +#define CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON (1<<2) //flags for covering body parts #define GLASSESCOVERSEYES (1<<0) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index cf2d69b7059..f712dc487d5 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -49,13 +49,11 @@ #define MOB_SPIRIT (1 << 9) #define MOB_PLANT (1 << 10) + //Organ defines for carbon mobs #define ORGAN_ORGANIC 1 #define ORGAN_ROBOTIC 2 -#define BODYPART_ORGANIC 1 -#define BODYPART_ROBOTIC 2 - #define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human_parts_greyscale.dmi' #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi' @@ -63,7 +61,62 @@ #define ALIEN_BODYPART "alien" #define LARVA_BODYPART "larva" +//Bodypart change blocking flags +///Bodypart does not get replaced during set_species() +#define BP_BLOCK_CHANGE_SPECIES (1<<0) +//Bodytype defines for how things can be worn, surgery, and other misc things. +///The limb is organic +#define BODYTYPE_ORGANIC (1<<0) +///The limb is robotic +#define BODYTYPE_ROBOTIC (1<<1) +///The limb fits the human mold +#define BODYTYPE_HUMANOID (1<<2) +///The limb is digitigrade +#define BODYTYPE_DIGITIGRADE (1<<3) //Cancer +///The limb fits the monkey mold +#define BODYTYPE_MONKEY (1<<4) +///The limb is snouted +#define BODYTYPE_SNOUTED (1<<5) + +//Defines for Species IDs +#define SPECIES_ABDUCTOR "abductor" +#define SPECIES_ANDROID "android" +#define SPECIES_DULLAHAN "dullahan" +#define SPECIES_ETHEREAL "ethereal" +#define SPECIES_FELINE "felinid" +#define SPECIES_FLYPERSON "fly" +#define SPECIES_HUMAN "human" +#define SPECIES_JELLYPERSON "jelly" +#define SPECIES_SLIMEPERSON "slime" +#define SPECIES_LUMINESCENT "luminescent" +#define SPECIES_STARGAZER "stargazer" +#define SPECIES_LIZARD "lizard" +#define SPECIES_LIZARD_ASH "ashwalker" +#define SPECIES_LIZARD_SILVER "silverscale" +#define SPECIES_NIGHTMARE "nightmare" +#define SPECIES_MONKEY "monkey" +#define SPECIES_MOTH "moth" +#define SPECIES_MUSHROOM "mush" +#define SPECIES_PLASMAMAN "plasmaman" +#define SPECIES_PODPERSON "pod" +#define SPECIES_SHADOW "shadow" +#define SPECIES_SKELETON "skeleton" +#define SPECIES_SNAIL "snail" +#define SPECIES_VAMPIRE "vampire" +#define SPECIES_ZOMBIE "zombie" +#define SPECIES_ZOMBIE_INFECTIOUS "memezombie" +#define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie" + +//See: datum/species/var/digitigrade_customization +///The species does not have digitigrade legs in generation. +#define DIGITIGRADE_NEVER 0 +///The species can have digitigrade legs in generation +#define DIGITIGRADE_OPTIONAL 1 +///The species is forced to have digitigrade legs in generation. +#define DIGITIGRADE_FORCED 2 + +//TODO: Remove entirely in favor of the BODYTYPE system ///Body type bitfields for allowed_animal_origin used to check compatible surgery body types (use NONE for no matching body type) #define HUMAN_BODY (1 << 0) #define MONKEY_BODY (1 << 1) diff --git a/code/__DEFINES/species_clothing_paths.dm b/code/__DEFINES/species_clothing_paths.dm new file mode 100644 index 00000000000..d1fb4f028aa --- /dev/null +++ b/code/__DEFINES/species_clothing_paths.dm @@ -0,0 +1,15 @@ +//HUMAN PATHS +///The dmi for humanoid uniforms +#define DEFAULT_UNIFORM_FILE 'icons/mob/clothing/under/default.dmi' +///The dmi for humanoid shoes +#define DEFAULT_SHOES_FILE 'icons/mob/clothing/feet.dmi' +///The dmi for humanoid oversuits +#define DEFAULT_SUIT_FILE 'icons/mob/clothing/suit.dmi' + +//DIGITIGRADE PATHS +///The dmi containing digitigrade uniforms +#define DIGITIGRADE_UNIFORM_FILE 'icons/mob/species/misc/digitigrade.dmi' +///The dmi containing digitigrade shoes +#define DIGITIGRADE_SHOES_FILE 'icons/mob/species/misc/digitigrade_shoes.dmi' +///The dmi containing digitigrade oversuits +#define DIGITIGRADE_SUIT_FILE 'icons/mob/species/misc/digitigrade_suits.dmi' diff --git a/code/__HELPERS/bodyparts.dm b/code/__HELPERS/bodyparts.dm new file mode 100644 index 00000000000..39df8e37e5f --- /dev/null +++ b/code/__HELPERS/bodyparts.dm @@ -0,0 +1 @@ +#define IS_ORGANIC_LIMB(limb) (limb.bodytype & BODYTYPE_ORGANIC) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 212cda4d758..5f9cef0db4a 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1321,3 +1321,26 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) animate(src, pixel_x = pixel_x + shiftx, pixel_y = pixel_y + shifty, time = 0.2, loop = duration) pixel_x = initialpixelx pixel_y = initialpixely + +///Checks if the given iconstate exists in the given file, caching the result. Setting scream to TRUE will print a stack trace ONCE. +/proc/icon_exists(file, state, scream) + var/static/list/icon_states_cache = list() + if(icon_states_cache[file]?[state]) + return TRUE + + if(icon_states_cache[file]?[state] == FALSE) + return FALSE + + var/list/states = icon_states(file) + + if(!icon_states_cache[file]) + icon_states_cache[file] = list() + + if(state in states) + icon_states_cache[file][state] = TRUE + return TRUE + else + icon_states_cache[file][state] = FALSE + if(scream) + stack_trace("Icon Lookup for state: [state] in file [file] failed.") + return FALSE diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 2162eca1b80..1a8c9a6886a 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -153,7 +153,7 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH, return . /// For finding out what body parts a body zone covers, the inverse of the below basically -/proc/zone2body_parts_covered(def_zone) +/proc/body_zone2cover_flags(def_zone) switch(def_zone) if(BODY_ZONE_CHEST) return list(CHEST, GROIN) @@ -169,14 +169,14 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH, return list(LEG_RIGHT, FOOT_RIGHT) //Turns a Body_parts_covered bitfield into a list of organ/limb names. -//(I challenge you to find a use for this) -I found a use for it!! -/proc/body_parts_covered2organ_names(bpc) +//(I challenge you to find a use for this) -I found a use for it!! | So did I!. +/proc/cover_flags2body_zones(bpc) var/list/covered_parts = list() if(!bpc) return 0 - if(bpc & FULL_BODY) + if(bpc == FULL_BODY) covered_parts |= list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM,BODY_ZONE_HEAD,BODY_ZONE_CHEST,BODY_ZONE_L_LEG,BODY_ZONE_R_LEG) else diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm index 4df4cece096..98aed39eba1 100644 --- a/code/__HELPERS/type_processing.dm +++ b/code/__HELPERS/type_processing.dm @@ -6,6 +6,7 @@ var/typename = "[type]" var/static/list/TYPES_SHORTCUTS = list( /obj/effect/decal/cleanable = "CLEANABLE", + /obj/item/bodypart = "BODYPART", /obj/item/radio/headset = "HEADSET", /obj/item/clothing/head/helmet/space = "SPESSHELMET", /obj/item/book/manual = "MANUAL", diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index cdd1cc60bcd..0be6e0c82ff 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -355,3 +355,18 @@ DEFINE_BITFIELD(reaction_flags, list( "REACTION_PH_VOL_CONSTANT" = REACTION_PH_VOL_CONSTANT, "REACTION_REAL_TIME_SPLIT" = REACTION_REAL_TIME_SPLIT, )) + +DEFINE_BITFIELD(bodytype, list( + "BODYTYPE_DIGITIGRADE" = BODYTYPE_DIGITIGRADE, + "BODYTYPE_HUMANOID" = BODYTYPE_HUMANOID, + "BODYTYPE_MONKEY" = BODYTYPE_MONKEY, + "BODYTYPE_ORGANIC" = BODYTYPE_ORGANIC, + "BODYTYPE_ROBOTIC" = BODYTYPE_ROBOTIC, + "BODYTYPE_SNOUTED" = BODYTYPE_SNOUTED, +)) + +DEFINE_BITFIELD(supports_variations_flags, list( + "CLOTHING_NO_VARIATION" = CLOTHING_NO_VARIATION, + "CLOTHING_DIGITIGRADE_VARIATION" = CLOTHING_DIGITIGRADE_VARIATION, + "CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON" = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON, +)) diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index 1394b074d33..64afd556a2a 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -493,7 +493,6 @@ GLOBAL_LIST_INIT(phobia_species, list( "conspiracies" = typecacheof(list( /datum/species/abductor, /datum/species/lizard, - /datum/species/synth, )), "insects" = typecacheof(list( /datum/species/fly, diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 9c4b5053841..16c10c5fd3c 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -52,7 +52,7 @@ freak_out(O) return for(var/mob/living/carbon/human/HU in seen_atoms) //check equipment for trigger items - for(var/X in HU.get_all_slots() | HU.held_items) + for(var/X in HU.get_all_worn_items() | HU.held_items) var/obj/I = X if(!QDELETED(I) && (is_type_in_typecache(I, trigger_objs) || (phobia_type == "blood" && HAS_BLOOD_DNA(I)))) freak_out(I) @@ -213,7 +213,7 @@ /datum/brain_trauma/mild/phobia/guns phobia_type = "guns" random_gain = FALSE - + /datum/brain_trauma/mild/phobia/blood phobia_type = "blood" random_gain = FALSE diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm index 2a8189dc358..83dcdab0207 100644 --- a/code/datums/components/bloodysoles.dm +++ b/code/datums/components/bloodysoles.dm @@ -262,7 +262,7 @@ var/obj/item/bodypart/affecting = X if(affecting.body_part == LEG_RIGHT || affecting.body_part == LEG_LEFT) if(!affecting.bodypart_disabled) - FP.species_types |= affecting.species_id + FP.species_types |= affecting.limb_id break diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 590c7e84f7d..bbc1d422c68 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -89,7 +89,7 @@ if(!istype(O)) return - if(O.status == BODYPART_ROBOTIC) + if(!IS_ORGANIC_LIMB(O)) return if (!(flags & CALTROP_BYPASS_SHOES)) diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm index 12e2f3e1660..53c92ba2513 100644 --- a/code/datums/components/creamed.dm +++ b/code/datums/components/creamed.dm @@ -25,9 +25,9 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list( if(ishuman(parent)) var/mob/living/carbon/human/H = parent - if(H.dna.species.limbs_id == "lizard") + if(H.dna.species.bodytype & BODYTYPE_SNOUTED) creamface.icon_state = "creampie_lizard" - else if(H.dna.species.limbs_id == "monkey") + else if(H.dna.species.bodytype & BODYTYPE_MONKEY) creamface.icon_state = "creampie_monkey" else creamface.icon_state = "creampie_human" diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm index 4e41d6b2f81..4e66f8ab35c 100644 --- a/code/datums/components/surgery_initiator.dm +++ b/code/datums/components/surgery_initiator.dm @@ -89,7 +89,7 @@ if(affecting) if(!surgery.requires_bodypart) continue - if(surgery.requires_bodypart_type && affecting.status != surgery.requires_bodypart_type) + if(surgery.requires_bodypart_type && !(affecting.bodytype & surgery.requires_bodypart_type)) continue if(surgery.requires_real_bodypart && affecting.is_pseudopart) continue @@ -128,7 +128,7 @@ var/required_tool_type = TOOL_CAUTERY var/obj/item/close_tool = user.get_inactive_held_item() - var/is_robotic = the_surgery.requires_bodypart_type == BODYPART_ROBOTIC + var/is_robotic = the_surgery.requires_bodypart_type == BODYTYPE_ROBOTIC if(is_robotic) required_tool_type = TOOL_SCREWDRIVER @@ -300,7 +300,7 @@ return - if (!isnull(affecting_limb) && surgery.requires_bodypart_type && affecting_limb.status != surgery.requires_bodypart_type) + if (!isnull(affecting_limb) && surgery.requires_bodypart_type && !(affecting_limb.bodytype & surgery.requires_bodypart_type)) target.balloon_alert(user, "not the right type of limb!") return diff --git a/code/datums/components/unbreakable.dm b/code/datums/components/unbreakable.dm index 8261dd6d3cb..0d27f7bc39c 100644 --- a/code/datums/components/unbreakable.dm +++ b/code/datums/components/unbreakable.dm @@ -24,7 +24,7 @@ return COOLDOWN_START(src, surge_cooldown, 1 MINUTES) surged.balloon_alert(surged, "you refuse to give up!")//breaks balloon alert conventions by using a "!" for a fail message but that's okay because it's a pretty awesome moment - surged.heal_overall_damage(15, 15, 0, BODYPART_ORGANIC) + surged.heal_overall_damage(15, 15, 0, BODYTYPE_ORGANIC) if(surged.reagents.get_reagent_amount(/datum/reagent/medicine/ephedrine) < 20) surged.reagents.add_reagent(/datum/reagent/medicine/ephedrine, 10) if(surged.reagents.get_reagent_amount(/datum/reagent/medicine/epinephrine) < 20) diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index 240abf84603..edb0d6e4aa4 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -71,14 +71,14 @@ Bonus /datum/symptom/fire/proc/Firestacks_stage_4(mob/living/M, datum/disease/advance/A) M.adjust_fire_stacks(1 * power) - M.take_overall_damage(burn = 3 * power, required_status = BODYPART_ORGANIC) + M.take_overall_damage(burn = 3 * power, required_status = BODYTYPE_ORGANIC) if(infective) A.spread(2) return 1 /datum/symptom/fire/proc/Firestacks_stage_5(mob/living/M, datum/disease/advance/A) M.adjust_fire_stacks(3 * power) - M.take_overall_damage(burn = 5 * power, required_status = BODYPART_ORGANIC) + M.take_overall_damage(burn = 5 * power, required_status = BODYTYPE_ORGANIC) if(infective) A.spread(4) return 1 @@ -164,7 +164,7 @@ Bonus /datum/symptom/alkali/proc/Alkali_fire_stage_4(mob/living/M, datum/disease/advance/A) var/get_stacks = 6 * power M.adjust_fire_stacks(get_stacks) - M.take_overall_damage(burn = get_stacks / 2, required_status = BODYPART_ORGANIC) + M.take_overall_damage(burn = get_stacks / 2, required_status = BODYTYPE_ORGANIC) if(chems) M.reagents.add_reagent(/datum/reagent/clf3, 2 * power) return 1 @@ -172,7 +172,7 @@ Bonus /datum/symptom/alkali/proc/Alkali_fire_stage_5(mob/living/M, datum/disease/advance/A) var/get_stacks = 8 * power M.adjust_fire_stacks(get_stacks) - M.take_overall_damage(burn = get_stacks, required_status = BODYPART_ORGANIC) + M.take_overall_damage(burn = get_stacks, required_status = BODYTYPE_ORGANIC) if(chems) M.reagents.add_reagent_list(list(/datum/reagent/napalm = 4 * power, /datum/reagent/clf3 = 4 * power)) return 1 diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 45fedd8947f..65b19657da6 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -59,7 +59,7 @@ Bonus /datum/symptom/flesh_eating/proc/Flesheat(mob/living/M, datum/disease/advance/A) var/get_damage = rand(15,25) * power - M.take_overall_damage(brute = get_damage, required_status = BODYPART_ORGANIC) + M.take_overall_damage(brute = get_damage, required_status = BODYTYPE_ORGANIC) if(pain) M.adjustStaminaLoss(get_damage * 2) if(bleed) @@ -131,7 +131,7 @@ Bonus /datum/symptom/flesh_death/proc/Flesh_death(mob/living/M, datum/disease/advance/A) var/get_damage = rand(6,10) - M.take_overall_damage(brute = get_damage, required_status = BODYPART_ORGANIC) + M.take_overall_damage(brute = get_damage, required_status = BODYTYPE_ORGANIC) if(chems) M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2)) if(zombie) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 973fad09349..b9088b7efb5 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -160,13 +160,13 @@ M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins - var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYPART_ORGANIC) + var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYTYPE_ORGANIC) if(!parts.len) return for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYPART_ORGANIC)) + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYTYPE_ORGANIC)) M.update_damage_overlays() return 1 @@ -278,7 +278,7 @@ /datum/symptom/heal/darkness/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) var/heal_amt = 2 * actual_power - var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYPART_ORGANIC) + var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYTYPE_ORGANIC) if(!parts.len) return @@ -287,7 +287,7 @@ to_chat(M, span_notice("The darkness soothes and mends your wounds.")) for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5, null, BODYPART_ORGANIC)) //more effective on brute + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5, null, BODYTYPE_ORGANIC)) //more effective on brute M.update_damage_overlays() return 1 @@ -381,7 +381,7 @@ return for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYPART_ORGANIC)) + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYTYPE_ORGANIC)) M.update_damage_overlays() if(active_coma && M.getBruteLoss() + M.getFireLoss() == 0) @@ -434,7 +434,7 @@ /datum/symptom/heal/water/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) var/heal_amt = 2 * actual_power - var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYPART_ORGANIC) //more effective on burns + var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYTYPE_ORGANIC) //more effective on burns if(!parts.len) return @@ -443,7 +443,7 @@ to_chat(M, span_notice("You feel yourself absorbing the water around you to soothe your damaged skin.")) for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len * 0.5, heal_amt/parts.len, null, BODYPART_ORGANIC)) + if(L.heal_damage(heal_amt/parts.len * 0.5, heal_amt/parts.len, null, BODYTYPE_ORGANIC)) M.update_damage_overlays() return 1 @@ -514,13 +514,13 @@ M.adjustToxLoss(-heal_amt) - var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYPART_ORGANIC) + var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYTYPE_ORGANIC) if(!parts.len) return if(prob(5)) to_chat(M, span_notice("The pain from your wounds fades rapidly.")) for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYPART_ORGANIC)) + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYTYPE_ORGANIC)) M.update_damage_overlays() return 1 @@ -564,7 +564,7 @@ M.adjustToxLoss(-(2 * heal_amt)) - var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYPART_ORGANIC) + var/list/parts = M.get_damaged_bodyparts(1,1, null, BODYTYPE_ORGANIC) if(!parts.len) return @@ -573,6 +573,6 @@ to_chat(M, span_notice("Your skin glows faintly, and you feel your wounds mending themselves.")) for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYPART_ORGANIC)) + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYTYPE_ORGANIC)) M.update_damage_overlays() return 1 diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index 98318060f28..6d6c2b843fb 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -51,7 +51,7 @@ BONUS var/mob/living/carbon/M = A.affected_mob var/picked_bodypart = pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) var/obj/item/bodypart/bodypart = M.get_bodypart(picked_bodypart) - if(bodypart && bodypart.status == BODYPART_ORGANIC && !bodypart.is_pseudopart) //robotic limbs will mean less scratching overall (why are golems able to damage themselves with self-scratching, but not androids? the world may never know) + if(bodypart && IS_ORGANIC_LIMB(bodypart) && !bodypart.is_pseudopart) //robotic limbs will mean less scratching overall (why are golems able to damage themselves with self-scratching, but not androids? the world may never know) var/can_scratch = scratch && !M.incapacitated() M.visible_message("[can_scratch ? span_warning("[M] scratches [M.p_their()] [bodypart.name].") : ""]", span_warning("Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]")) if(can_scratch) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index b7498d257e6..c7566579bea 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -489,9 +489,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) /mob/living/carbon/human/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) ..() if(icon_update) - update_body() - update_hair() - update_body_parts() + update_body(is_creating = TRUE) update_mutations_overlay()// no lizard with human hulk overlay please. @@ -533,9 +531,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) domutcheck() if(mrace || newfeatures || ui) - update_body() - update_hair() - update_body_parts() + update_body(is_creating = TRUE) update_mutations_overlay() if(LAZYLEN(mutations)) @@ -615,9 +611,9 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(icon_update) dna.species.handle_body(src) // We want 'update_body_parts()' to be called only if mutcolor_update is TRUE, so no 'update_body()' here. - update_hair() + update_hair(is_creating = TRUE) if(mutcolor_update) - update_body_parts() + update_body_parts(update_limb_data = TRUE) if(mutations_overlay_update) update_mutations_overlay() diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index dd6753166ef..466c6b328b8 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -506,7 +506,7 @@ if(brain) //so this doesn't instantly kill you. we could delete the brain, but it lets people cure brain issues they /really/ shouldn't be brain.zone = BODY_ZONE_HEAD UnregisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB) - var/successful = owner.regenerate_limb(BODY_ZONE_HEAD, noheal = TRUE) //noheal needs to be TRUE to prevent weird adding and removing mutation healing + var/successful = owner.regenerate_limb(BODY_ZONE_HEAD) if(!successful) stack_trace("HARS mutation head regeneration failed! (usually caused by headless syndrome having a head)") return TRUE diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 0b39d88cc98..16e4b4d5018 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -110,7 +110,7 @@ * * attack_direction: For bloodsplatters, if relevant */ /datum/wound/proc/apply_wound(obj/item/bodypart/L, silent = FALSE, datum/wound/old_wound = null, smited = FALSE, attack_direction = null) - if(!istype(L) || !L.owner || !(L.body_zone in viable_zones) || !L.is_organic_limb() || HAS_TRAIT(L.owner, TRAIT_NEVER_WOUNDED)) + if(!istype(L) || !L.owner || !(L.body_zone in viable_zones) || !IS_ORGANIC_LIMB(L) || HAS_TRAIT(L.owner, TRAIT_NEVER_WOUNDED)) qdel(src) return diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 5558d9b68b2..c481eb3eba6 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -48,7 +48,7 @@ I = victim.get_inactive_held_item() if(I && victim.dropItemToGround(I)) - victim.visible_message(span_danger("[victim] drops [I] in shock!"), span_warning("The force on your [limb.name] causes you to drop [I]!"), vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_danger("[victim] drops [I] in shock!"), span_warning("The force on your [parse_zone(limb.body_zone)] causes you to drop [I]!"), vision_distance=COMBAT_MESSAGE_RANGE) update_inefficiencies() @@ -91,7 +91,7 @@ if(!victim || !limb) qdel(src) return - to_chat(victim, span_green("Your [limb.name] has recovered from its [name]!")) + to_chat(victim, span_green("Your [parse_zone(limb.body_zone)] has recovered from its [name]!")) remove_wound() /// If we're a human who's punching something with a broken arm, we might hurt ourselves doing so @@ -105,11 +105,11 @@ if(prob((severity - 1) * 15)) // And you have a 70% or 50% chance to actually land the blow, respectively if(prob(70 - 20 * (severity - 1))) - to_chat(victim, span_userdanger("The fracture in your [limb.name] shoots with pain as you strike [target]!")) + to_chat(victim, span_userdanger("The fracture in your [parse_zone(limb.body_zone)] shoots with pain as you strike [target]!")) limb.receive_damage(brute=rand(1,5)) else - victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.name], recoiling from pain!"), \ - span_userdanger("You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] broken [parse_zone(limb.body_zone)], recoiling from pain!"), \ + span_userdanger("You fail to strike [target] as the fracture in your [parse_zone(limb.body_zone)] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE) INVOKE_ASYNC(victim, /mob.proc/emote, "scream") victim.Stun(0.5 SECONDS) limb.receive_damage(brute=rand(3,7)) @@ -149,7 +149,7 @@ var/list/msg = list() if(!limb.current_gauze) - msg += "[victim.p_their(TRUE)] [limb.name] [examine_desc]" + msg += "[victim.p_their(TRUE)] [parse_zone(limb.body_zone)] [examine_desc]" else var/sling_condition = "" // how much life we have left in these bandages @@ -163,7 +163,7 @@ if(4 to INFINITY) sling_condition = "tightly" - msg += "[victim.p_their(TRUE)] [limb.name] is [sling_condition] fastened in a sling of [limb.current_gauze.name]" + msg += "[victim.p_their(TRUE)] [parse_zone(limb.body_zone)] is [sling_condition] fastened in a sling of [limb.current_gauze.name]" if(taped) msg += ", [span_notice("and appears to be reforming itself under some surgical tape!")]" @@ -231,7 +231,7 @@ /datum/wound/blunt/moderate/proc/door_crush() SIGNAL_HANDLER if(prob(40)) - victim.visible_message(span_danger("[victim]'s dislocated [limb.name] pops back into place!"), span_userdanger("Your dislocated [limb.name] pops back into place! Ow!")) + victim.visible_message(span_danger("[victim]'s dislocated [parse_zone(limb.body_zone)] pops back into place!"), span_userdanger("Your dislocated [parse_zone(limb.body_zone)] pops back into place! Ow!")) remove_wound() /datum/wound/blunt/moderate/try_handling(mob/living/carbon/human/user) @@ -243,8 +243,8 @@ return TRUE if(user.grab_state >= GRAB_AGGRESSIVE) - user.visible_message(span_danger("[user] begins twisting and straining [victim]'s dislocated [limb.name]!"), span_notice("You begin twisting and straining [victim]'s dislocated [limb.name]..."), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] begins twisting and straining your dislocated [limb.name]!")) + user.visible_message(span_danger("[user] begins twisting and straining [victim]'s dislocated [parse_zone(limb.body_zone)]!"), span_notice("You begin twisting and straining [victim]'s dislocated [parse_zone(limb.body_zone)]..."), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] begins twisting and straining your dislocated [parse_zone(limb.body_zone)]!")) if(!user.combat_mode) chiropractice(user) else @@ -259,14 +259,14 @@ return if(prob(65)) - user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.name] back into place!"), span_notice("You snap [victim]'s dislocated [limb.name] back into place!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] back into place!")) + user.visible_message(span_danger("[user] snaps [victim]'s dislocated [parse_zone(limb.body_zone)] back into place!"), span_notice("You snap [victim]'s dislocated [parse_zone(limb.body_zone)] back into place!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] snaps your dislocated [parse_zone(limb.body_zone)] back into place!")) victim.emote("scream") limb.receive_damage(brute=20, wound_bonus=CANT_WOUND) qdel(src) else - user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.name] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.name] around painfully!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.name] around painfully!")) + user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [parse_zone(limb.body_zone)] around painfully!"), span_danger("You wrench [victim]'s dislocated [parse_zone(limb.body_zone)] around painfully!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] wrenches your dislocated [parse_zone(limb.body_zone)] around painfully!")) limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) chiropractice(user) @@ -278,33 +278,33 @@ return if(prob(65)) - user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.name] with a sickening crack!"), span_danger("You snap [victim]'s dislocated [limb.name] with a sickening crack!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] with a sickening crack!")) + user.visible_message(span_danger("[user] snaps [victim]'s dislocated [parse_zone(limb.body_zone)] with a sickening crack!"), span_danger("You snap [victim]'s dislocated [parse_zone(limb.body_zone)] with a sickening crack!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] snaps your dislocated [parse_zone(limb.body_zone)] with a sickening crack!")) victim.emote("scream") limb.receive_damage(brute=25, wound_bonus=30) else - user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.name] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.name] around painfully!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.name] around painfully!")) + user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [parse_zone(limb.body_zone)] around painfully!"), span_danger("You wrench [victim]'s dislocated [parse_zone(limb.body_zone)] around painfully!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] wrenches your dislocated [parse_zone(limb.body_zone)] around painfully!")) limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) malpractice(user) /datum/wound/blunt/moderate/treat(obj/item/I, mob/user) if(victim == user) - victim.visible_message(span_danger("[user] begins resetting [victim.p_their()] [limb.name] with [I]."), span_warning("You begin resetting your [limb.name] with [I]...")) + victim.visible_message(span_danger("[user] begins resetting [victim.p_their()] [parse_zone(limb.body_zone)] with [I]."), span_warning("You begin resetting your [parse_zone(limb.body_zone)] with [I]...")) else - user.visible_message(span_danger("[user] begins resetting [victim]'s [limb.name] with [I]."), span_notice("You begin resetting [victim]'s [limb.name] with [I]...")) + user.visible_message(span_danger("[user] begins resetting [victim]'s [parse_zone(limb.body_zone)] with [I]."), span_notice("You begin resetting [victim]'s [parse_zone(limb.body_zone)] with [I]...")) if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) return if(victim == user) limb.receive_damage(brute=15, wound_bonus=CANT_WOUND) - victim.visible_message(span_danger("[user] finishes resetting [victim.p_their()] [limb.name]!"), span_userdanger("You reset your [limb.name]!")) + victim.visible_message(span_danger("[user] finishes resetting [victim.p_their()] [parse_zone(limb.body_zone)]!"), span_userdanger("You reset your [parse_zone(limb.body_zone)]!")) else limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) - user.visible_message(span_danger("[user] finishes resetting [victim]'s [limb.name]!"), span_nicegreen("You finish resetting [victim]'s [limb.name]!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] resets your [limb.name]!")) + user.visible_message(span_danger("[user] finishes resetting [victim]'s [parse_zone(limb.body_zone)]!"), span_nicegreen("You finish resetting [victim]'s [parse_zone(limb.body_zone)]!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] resets your [parse_zone(limb.body_zone)]!")) victim.emote("scream") qdel(src) @@ -375,10 +375,10 @@ return if(gelled) - to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!")) + to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [parse_zone(limb.body_zone)] is already coated with bone gel!")) return - user.visible_message(span_danger("[user] begins hastily applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name], disregarding the warning label...")) + user.visible_message(span_danger("[user] begins hastily applying [I] to [victim]'s' [parse_zone(limb.body_zone)]..."), span_warning("You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)], disregarding the warning label...")) if(!do_after(user, base_treat_time * 1.5 * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) return @@ -386,8 +386,8 @@ I.use(1) victim.emote("scream") if(user != victim) - user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.name]!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] finishes applying [I] to your [limb.name], and you can feel the bones exploding with pain as they begin melting and reforming!")) + user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [parse_zone(limb.body_zone)], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [parse_zone(limb.body_zone)]!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] finishes applying [I] to your [parse_zone(limb.body_zone)], and you can feel the bones exploding with pain as they begin melting and reforming!")) else var/painkiller_bonus = 0 if(victim.drunkenness > 10) @@ -402,10 +402,10 @@ painkiller_bonus += 20 if(prob(25 + (20 * (severity - 2)) - painkiller_bonus)) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by painkillers - victim.visible_message(span_danger("[victim] fails to finish applying [I] to [victim.p_their()] [limb.name], passing out from the pain!"), span_notice("You pass out from the pain of applying [I] to your [limb.name] before you can finish!")) + victim.visible_message(span_danger("[victim] fails to finish applying [I] to [victim.p_their()] [parse_zone(limb.body_zone)], passing out from the pain!"), span_notice("You pass out from the pain of applying [I] to your [parse_zone(limb.body_zone)] before you can finish!")) victim.AdjustUnconscious(5 SECONDS) return - victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.name], grimacing from the pain!"), span_notice("You finish applying [I] to your [limb.name], and your bones explode in pain!")) + victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [parse_zone(limb.body_zone)], grimacing from the pain!"), span_notice("You finish applying [I] to your [parse_zone(limb.body_zone)], and your bones explode in pain!")) limb.receive_damage(25, stamina=100, wound_bonus=CANT_WOUND) gelled = TRUE @@ -416,20 +416,20 @@ return // poser if(gelled) - to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!")) + to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [parse_zone(limb.body_zone)] is already coated with bone gel!")) return - user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")) + user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [parse_zone(limb.body_zone)]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)]...")) if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) return I.use(1) if(user != victim) - user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.name]!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[user] finishes applying [I] to your [limb.name], and you feel a funny fizzy tickling as they begin to reform!")) + user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [parse_zone(limb.body_zone)], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [parse_zone(limb.body_zone)]!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] finishes applying [I] to your [parse_zone(limb.body_zone)], and you feel a funny fizzy tickling as they begin to reform!")) else - victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.name], emitting a funny fizzing sound!"), span_notice("You finish applying [I] to your [limb.name], and feel a funny fizzy tickling as the bone begins to reform!")) + victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [parse_zone(limb.body_zone)], emitting a funny fizzing sound!"), span_notice("You finish applying [I] to your [parse_zone(limb.body_zone)], and feel a funny fizzy tickling as the bone begins to reform!")) gelled = TRUE processes = TRUE @@ -437,13 +437,13 @@ /// if someone is using surgical tape on our wound /datum/wound/blunt/proc/tape(obj/item/stack/sticky_tape/surgical/I, mob/user) if(!gelled) - to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] must be coated with bone gel to perform this emergency operation!")) + to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [parse_zone(limb.body_zone)] must be coated with bone gel to perform this emergency operation!")) return if(taped) - to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] is already wrapped in [I.name] and reforming!")) + to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [parse_zone(limb.body_zone)] is already wrapped in [I.name] and reforming!")) return - user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")) + user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [parse_zone(limb.body_zone)]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)]...")) if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) return @@ -453,10 +453,10 @@ I.use(1) if(user != victim) - user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.name]!"), ignored_mobs=victim) - to_chat(victim, span_green("[user] finishes applying [I] to your [limb.name], you immediately begin to feel your bones start to reform!")) + user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [parse_zone(limb.body_zone)], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [parse_zone(limb.body_zone)]!"), ignored_mobs=victim) + to_chat(victim, span_green("[user] finishes applying [I] to your [parse_zone(limb.body_zone)], you immediately begin to feel your bones start to reform!")) else - victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.name], !"), span_green("You finish applying [I] to your [limb.name], and you immediately begin to feel your bones start to reform!")) + victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [parse_zone(limb.body_zone)], !"), span_green("You finish applying [I] to your [parse_zone(limb.body_zone)], and you immediately begin to feel your bones start to reform!")) taped = TRUE processes = TRUE diff --git a/code/datums/wounds/scars/_scars.dm b/code/datums/wounds/scars/_scars.dm index 514f99cc687..442923dc322 100644 --- a/code/datums/wounds/scars/_scars.dm +++ b/code/datums/wounds/scars/_scars.dm @@ -87,7 +87,7 @@ /// Used to "load" a persistent scar /datum/scar/proc/load(obj/item/bodypart/BP, version, description, specific_location, severity=WOUND_SEVERITY_SEVERE, biology=BIO_FLESH_BONE, char_slot) - if(!BP.is_organic_limb()) + if(!IS_ORGANIC_LIMB(BP)) qdel(src) return diff --git a/code/game/atoms.dm b/code/game/atoms.dm index fbfd49acef6..4785b010945 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -672,6 +672,9 @@ * Produces a signal [COMSIG_PARENT_EXAMINE_MORE] */ /atom/proc/examine_more(mob/user) + SHOULD_CALL_PARENT(TRUE) + RETURN_TYPE(/list) + . = list() SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .) diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm index 69a9b80a75b..1f6e3ecb07d 100644 --- a/code/game/machinery/computer/arcade/arcade.dm +++ b/code/game/machinery/computer/arcade/arcade.dm @@ -602,14 +602,15 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( return ..() //well boys we did it, lists are no more /obj/machinery/computer/arcade/battle/examine_more(mob/user) - var/list/msg = list(span_notice("You notice some writing scribbled on the side of [src]...")) - msg += "\t[span_info("smart -> defend, defend, light attack")]" - msg += "\t[span_info("shotgun -> defend, defend, power attack")]" - msg += "\t[span_info("short temper -> counter, counter, counter")]" - msg += "\t[span_info("poisonous -> light attack, light attack, light attack")]" - msg += "\t[span_info("chonker -> power attack, power attack, power attack")]" - msg += "\t[span_info("magical -> defend until outmagiced")]" - return msg + . = ..() + . += span_notice("You notice some writing scribbled on the side of [src]...") + . += "\t[span_info("smart -> defend, defend, light attack")]" + . += "\t[span_info("shotgun -> defend, defend, power attack")]" + . += "\t[span_info("short temper -> counter, counter, counter")]" + . += "\t[span_info("poisonous -> light attack, light attack, light attack")]" + . += "\t[span_info("chonker -> power attack, power attack, power attack")]" + . += "\t[span_info("magical -> defend until outmagiced")]" + return . /obj/machinery/computer/arcade/battle/emag_act(mob/user) if(obj_flags & EMAGGED) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 06863d274b7..067c64e6340 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -194,10 +194,10 @@ reagents.remove_reagent(reagent_id, modified_consumed_reagents_list[reagent_id]) var/built_typepath = being_built.build_path - // If we have a bodypart, we need to initialize the limb on its own. Otherwise we can build it here. if(ispath(built_typepath, /obj/item/bodypart)) - build_limb(built_typepath) + build_limb(create_buildpath()) else + //Just build whatever it is new built_typepath(loc) busy = FALSE @@ -214,26 +214,24 @@ */ /obj/machinery/limbgrower/proc/build_limb(buildpath) /// The limb we're making with our buildpath, so we can edit it. - var/obj/item/bodypart/limb = new buildpath(loc) - /// Species with greyscale limbs. - var/list/greyscale_species = list(SPECIES_HUMAN, SPECIES_LIZARD, SPECIES_ETHEREAL) - if(selected_category in greyscale_species) //Species with greyscale parts should be included here - if(selected_category == SPECIES_HUMAN) //humans don't use the full colour spectrum, they use random_skin_tone - limb.skin_tone = random_skin_tone() - else - limb.species_color = "#[random_color()]" - limb.icon = 'icons/mob/human_parts_greyscale.dmi' - limb.should_draw_greyscale = TRUE - else - limb.icon = 'icons/mob/human_parts.dmi' - - // Set this limb up using the species name and body zone - limb.icon_state = "[selected_category]_[limb.body_zone]" - limb.name = "\improper biosynthetic [selected_category] [parse_zone(limb.body_zone)]" - limb.desc = "A synthetically produced [selected_category] limb, grown in a tube. This one is for the [parse_zone(limb.body_zone)]." - limb.species_id = selected_category + //i need to create a body part manually using a set icon (otherwise it doesnt appear) + var/obj/item/bodypart/limb + limb = new buildpath(loc) + limb.name = "\improper synthetic [selected_category] [parse_zone(limb.body_zone)]" + limb.limb_id = selected_category + limb.mutation_color = "#62A262" limb.update_icon_dropped() - limb.original_owner = WEAKREF(src) //prevents updating the icon, so a lizard arm on a human stays a lizard arm etc. + +///Returns a valid limb typepath based on the selected option +/obj/machinery/limbgrower/proc/create_buildpath() + var/part_type = being_built.id //their ids match bodypart typepaths + var/species = selected_category + var/path + if(species == SPECIES_HUMAN) //Humans use the parent type. + path = "/obj/item/bodypart/[part_type]" + else + path = "/obj/item/bodypart/[part_type]/[species]" + return text2path(path) /obj/machinery/limbgrower/RefreshParts() reagents.maximum_volume = 0 diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 142c0b92639..7aa407b2998 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -468,11 +468,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/random, 32) icon_state = "gas_power" /obj/structure/sign/poster/contraband/donk_co/examine_more(mob/user) - var/list/msg = list(span_notice("You browse some of the poster's information...")) - msg += "\t[span_info("DONK CO. BRAND DONK POCKETS: IRRESISTABLY DONK!")]" - msg += "\t[span_info("AVAILABLE IN OVER 200 DONKTASTIC FLAVOURS: TRY CLASSIC MEAT, HOT AND SPICY, NEW YORK PEPPERONI PIZZA, BREAKFAST SAUSAGE AND EGG, PHILADELPHIA CHEESESTEAK, HAMBURGER DONK-A-RONI, CHEESE-O-RAMA, AND MANY MORE!")]" - msg += "\t[span_info("AVAILABLE FROM ALL GOOD RETAILERS, AND MANY BAD ONES TOO!")]" - return msg + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("DONK CO. BRAND DONK POCKETS: IRRESISTABLY DONK!")]" + . += "\t[span_info("AVAILABLE IN OVER 200 DONKTASTIC FLAVOURS: TRY CLASSIC MEAT, HOT AND SPICY, NEW YORK PEPPERONI PIZZA, BREAKFAST SAUSAGE AND EGG, PHILADELPHIA CHEESESTEAK, HAMBURGER DONK-A-RONI, CHEESE-O-RAMA, AND MANY MORE!")]" + . += "\t[span_info("AVAILABLE FROM ALL GOOD RETAILERS, AND MANY BAD ONES TOO!")]" + return . /obj/structure/sign/poster/contraband/cybersun_six_hundred name = "Saibāsan: 600 Years Commemorative Poster" @@ -734,15 +735,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/random, 32) icon_state = "plasma_effects" /obj/structure/sign/poster/official/plasma_effects/examine_more(mob/user) - var/list/msg = list(span_notice("You browse some of the poster's information...")) - msg += "\t[span_info("Plasma (scientific name Amenthium) is classified by TerraGov as a Grade 1 Health Hazard, and has significant risks to health associated with chronic exposure.")]" - msg += "\t[span_info("Plasma is known to cross the blood/brain barrier and bioaccumulate in brain tissue, where it begins to result in degradation of brain function. The mechanism for attack is not yet fully known, and as such no concrete preventative advice is available barring proper use of PPE (gloves + protective jumpsuit + respirator).")]" - msg += "\t[span_info("In small doses, plasma induces confusion, short-term amnesia, and heightened aggression. These effects persist with continual exposure.")]" - msg += "\t[span_info("In individuals with chronic exposure, severe effects have been noted. Further heightened aggression, long-term amnesia, Alzheimer's symptoms, schizophrenia, macular degeneration, aneurysms, heightened risk of stroke, and Parkinsons symptoms have all been noted.")]" - msg += "\t[span_info("It is recommended that all individuals in unprotected contact with raw plasma regularly check with company health officials.")]" - msg += "\t[span_info("For more information, please check with TerraGov's extranet site on Amenthium: www.terra.gov/health_and_safety/amenthium/, or our internal risk-assessment documents (document numbers #47582-b (Plasma safety data sheets) and #64210 through #64225 (PPE regulations for working with Plasma), available via NanoDoc to all employees).")]" - msg += "\t[span_info("Nanotrasen: Always looking after your health.")]" - return msg + . = ..() + . += span_notice("You browse some of the poster's information...") + . += "\t[span_info("Plasma (scientific name Amenthium) is classified by TerraGov as a Grade 1 Health Hazard, and has significant risks to health associated with chronic exposure.")]" + . += "\t[span_info("Plasma is known to cross the blood/brain barrier and bioaccumulate in brain tissue, where it begins to result in degradation of brain function. The mechanism for attack is not yet fully known, and as such no concrete preventative advice is available barring proper use of PPE (gloves + protective jumpsuit + respirator).")]" + . += "\t[span_info("In small doses, plasma induces confusion, short-term amnesia, and heightened aggression. These effects persist with continual exposure.")]" + . += "\t[span_info("In individuals with chronic exposure, severe effects have been noted. Further heightened aggression, long-term amnesia, Alzheimer's symptoms, schizophrenia, macular degeneration, aneurysms, heightened risk of stroke, and Parkinsons symptoms have all been noted.")]" + . += "\t[span_info("It is recommended that all individuals in unprotected contact with raw plasma regularly check with company health officials.")]" + . += "\t[span_info("For more information, please check with TerraGov's extranet site on Amenthium: www.terra.gov/health_and_safety/amenthium/, or our internal risk-assessment documents (document numbers #47582-b (Plasma safety data sheets) and #64210 through #64225 (PPE regulations for working with Plasma), available via NanoDoc to all employees).")]" + . += "\t[span_info("Nanotrasen: Always looking after your health.")]" + return . /obj/structure/sign/poster/official/terragov name = "TerraGov: United for Humanity" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d330ceb0180..e9fb99dd5e8 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -149,6 +149,8 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e var/list/attack_verb_simple ///list() of species types, if a species cannot put items in a certain slot, but species type is in list, it will be able to wear that item var/list/species_exception = null + ///This is a bitfield that defines what variations exist for bodyparts like Digi legs. See: code\_DEFINES\inventory.dm + var/supports_variations_flags = NONE ///A weakref to the mob who threw the item var/datum/weakref/thrownby = null //I cannot verbally describe how much I hate this var diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index ab4d0b6aa90..2f7e99a195e 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -680,31 +680,32 @@ . += span_notice("There's more information below, you can look again to take a closer look...") /obj/item/card/id/examine_more(mob/user) - var/list/msg = list(span_notice("You examine [src] closer, and note the following...")) + . = ..() + . += span_notice("You examine [src] closer, and note the following...") if(registered_age) - msg += "The card indicates that the holder is [registered_age] years old. [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads [span_danger("'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO'")] along the bottom of the card." : ""]" + . += "The card indicates that the holder is [registered_age] years old. [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads [span_danger("'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO'")] along the bottom of the card." : ""]" if(mining_points) - msg += "There's [mining_points] mining equipment redemption point\s loaded onto this card." + . += "There's [mining_points] mining equipment redemption point\s loaded onto this card." if(registered_account) - msg += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr." + . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr." if(registered_account.account_job) var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department) if(D) - msg += "The [D.account_holder] reports a balance of [D.account_balance] cr." - msg += span_info("Alt-Click the ID to pull money from the linked account in the form of holochips.") - msg += span_info("You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.") + . += "The [D.account_holder] reports a balance of [D.account_balance] cr." + . += span_info("Alt-Click the ID to pull money from the linked account in the form of holochips.") + . += span_info("You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.") if(registered_account.civilian_bounty) - msg += "There is an active civilian bounty." - msg += span_info("[registered_account.bounty_text()]") - msg += span_info("Quantity: [registered_account.bounty_num()]") - msg += span_info("Reward: [registered_account.bounty_value()]") + . += "There is an active civilian bounty." + . += span_info("[registered_account.bounty_text()]") + . += span_info("Quantity: [registered_account.bounty_num()]") + . += span_info("Reward: [registered_account.bounty_value()]") if(registered_account.account_holder == user.real_name) - msg += span_boldnotice("If you lose this ID card, you can reclaim your account by Alt-Clicking a blank ID card while holding it and entering your account ID number.") + . += span_boldnotice("If you lose this ID card, you can reclaim your account by Alt-Clicking a blank ID card while holding it and entering your account ID number.") else - msg += span_info("There is no registered account linked to this card. Alt-Click to add one.") + . += span_info("There is no registered account linked to this card. Alt-Click to add one.") - return msg + return . /obj/item/card/id/GetAccess() return access.Copy() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index a000c331b0f..1fbcda5fcc4 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -786,7 +786,7 @@ if(istype(target, /obj/item/bodypart) && actually_paints) var/obj/item/bodypart/limb = target - if(limb.status == BODYPART_ROBOTIC) + if(!IS_ORGANIC_LIMB(limb)) var/list/skins = list() var/static/list/style_list_icons = list("standard" = 'icons/mob/augmentation/augments.dmi', "engineer" = 'icons/mob/augmentation/augments_engineer.dmi', "security" = 'icons/mob/augmentation/augments_security.dmi', "mining" = 'icons/mob/augmentation/augments_mining.dmi') for(var/skin_option in style_list_icons) diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index 697ad13e4a7..ded8c0ee892 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -234,7 +234,7 @@ if(mode == SCANNER_VERBOSE) for(var/obj/item/bodypart/limb as anything in damaged) - dmgreport += "[capitalize(limb.name)]:" + dmgreport += "[capitalize(parse_zone(limb.body_zone))]:" dmgreport += "[(limb.brute_dam > 0) ? "[CEILING(limb.brute_dam,1)]" : "0"]" dmgreport += "[(limb.burn_dam > 0) ? "[CEILING(limb.burn_dam,1)]" : "0"]" dmgreport += "" diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 190c30f3bcd..0b6a0f73457 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -922,11 +922,12 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/ready_donk/examine_more(mob/user) - var/list/msg = list(span_notice("You browse the back of the box...")) - msg += "\t[span_info("Ready-Donk: a product of Donk Co.")]" - msg += "\t[span_info("Heating instructions: open box and pierce film, heat in microwave on high for 2 minutes. Allow to stand for 60 seconds prior to eating. Product will be hot.")]" - msg += "\t[span_info("Per 200g serving contains: 8g Sodium; 25g Fat, of which 22g are saturated; 2g Sugar.")]" - return msg + . = ..() + . += span_notice("You browse the back of the box...") + . += "\t[span_info("Ready-Donk: a product of Donk Co.")]" + . += "\t[span_info("Heating instructions: open box and pierce film, heat in microwave on high for 2 minutes. Allow to stand for 60 seconds prior to eating. Product will be hot.")]" + . += "\t[span_info("Per 200g serving contains: 8g Sodium; 25g Fat, of which 22g are saturated; 2g Sugar.")]" + return . /obj/item/food/ready_donk/warm name = "warm Ready-Donk: Bachelor Chow" diff --git a/code/game/objects/items/food/moth.dm b/code/game/objects/items/food/moth.dm index 92981cb7d4f..c5d8b48dbae 100644 --- a/code/game/objects/items/food/moth.dm +++ b/code/game/objects/items/food/moth.dm @@ -369,7 +369,7 @@ foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL -/obj/item/food/soup/moth_bean_stew +/obj/item/food/soup/moth_bean_stew name = "prickeldröndolhaskl" //prickeld = spicy, röndol = bean, haskl = stew desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread." icon = 'icons/obj/food/moth.dmi' @@ -389,7 +389,7 @@ foodtypes = VEGETABLES | GRAIN w_class = WEIGHT_CLASS_SMALL -/obj/item/food/soup/moth_fire_soup +/obj/item/food/soup/moth_fire_soup name = "tömpröttkrakklmæsch" //tömprött = heart (tömp = thump, rött = muscle), krakkl = fire, mæsch = soup desc = "Tömpröttkrakklmæsch, or heartburn soup, is a cold soup dish that originated amongst the jungle moths, and is named for two things- its rosy pink colour, and its scorchingly hot chilli heat." icon = 'icons/obj/food/moth.dmi' @@ -400,7 +400,7 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/soup/rice_porridge - name = "rice porridge" + name = "rice porridge" desc = "A plate of rice porridge. It's mostly flavourless, but it does fill a spot. To the Chinese it's congee, and moths call it höllflöfmisklsløsk." //höllflöfmiskl = rice (höllflöf = cloud, miskl = seed), sløsk = porridge icon = 'icons/obj/food/moth.dmi' icon_state = "rice_porridge" @@ -410,7 +410,7 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/soup/hua_mulan_congee - name = "\improper Hua Mulan congee" + name = "\improper Hua Mulan congee" desc = "Nobody is quite sure why this smiley bowl of rice porridge with eggs and bacon is named after a mythological Chinese figure- it's just sorta what it's always been called." icon = 'icons/obj/food/moth.dmi' icon_state = "hua_mulan_congee" @@ -420,7 +420,7 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/soup/toechtauese_rice_porridge - name = "töchtaüse rice porridge" + name = "töchtaüse rice porridge" desc = "Commonly served aboard the mothic fleet, rice porridge with töchtaüse syrup is more palatable than the regular stuff, if even just because it's spicier than normal." icon = 'icons/obj/food/moth.dmi' icon_state = "toechtauese_rice_porridge" @@ -430,7 +430,7 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/soup/cornmeal_porridge - name = "cornmeal porridge" + name = "cornmeal porridge" desc = "A plate of cornmeal porridge. It's more flavourful than most porridges, and makes a good base for other flavours, too." icon = 'icons/obj/food/moth.dmi' icon_state = "cornmeal_porridge" @@ -440,7 +440,7 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/soup/cheesy_porridge //milk, polenta, firm cheese, curd cheese, butter - name = "cheesy porridge" + name = "cheesy porridge" desc = "A rich and creamy bowl of cheesy cornmeal porridge." icon = 'icons/obj/food/moth.dmi' icon_state = "cheesy_porridge" @@ -450,7 +450,7 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/soup/fried_eggplant_polenta - name = "fried eggplant and polenta" + name = "fried eggplant and polenta" desc = "Polenta loaded with cheese, served with a few discs of fried eggplant and some tomato sauce. Lække!" icon = 'icons/obj/food/moth.dmi' icon_state = "fried_eggplant_polenta" @@ -765,16 +765,17 @@ custom_premium_price = PAYCHECK_EASY * 1.5 /obj/item/storage/box/gum/wake_up/examine_more(mob/user) - var/list/msg = list(span_notice("You read some of the health and safety information...")) - msg += "\t[span_info("For the relief of tiredness and drowsiness while working.")]" - msg += "\t[span_info("Do not chew more than one strip every 12 hours. Do not use as a complete substitute for sleep.")]" - msg += "\t[span_info("Do not give to children under 16. Do not exceed the maximum dosage. Do not ingest. Do not take for more than 3 days consecutively. Do not take in conjunction with other medication. May cause adverse reactions in patients with pre-existing heart conditions.")]" - msg += "\t[span_info("Side effects of Activin use may include twitchy antennae, overactive wings, loss of keratin sheen, loss of setae coverage, arrythmia, blurred vision, and euphoria. Cease taking the medication if side effects occur.")]" - msg += "\t[span_info("Repeated use may cause addiction.")]" - msg += "\t[span_info("If the maximum dosage is exceeded, inform a member of your assigned vessel's medical staff immediately. Do not induce vomiting.")]" - msg += "\t[span_info("Ingredients: each strip contains 500mg of Activin (dextro-methamphetamine). Other ingredients include Green Dye 450 (Verdant Meadow) and artificial herb flavouring.")]" - msg += "\t[span_info("Storage: keep in a cool dry place. Do not use after the use-by date: 32/4/350.")]" - return msg + . = ..() + . += span_notice("You read some of the health and safety information...") + . += "\t[span_info("For the relief of tiredness and drowsiness while working.")]" + . += "\t[span_info("Do not chew more than one strip every 12 hours. Do not use as a complete substitute for sleep.")]" + . += "\t[span_info("Do not give to children under 16. Do not exceed the maximum dosage. Do not ingest. Do not take for more than 3 days consecutively. Do not take in conjunction with other medication. May cause adverse reactions in patients with pre-existing heart conditions.")]" + . += "\t[span_info("Side effects of Activin use may include twitchy antennae, overactive wings, loss of keratin sheen, loss of setae coverage, arrythmia, blurred vision, and euphoria. Cease taking the medication if side effects occur.")]" + . += "\t[span_info("Repeated use may cause addiction.")]" + . += "\t[span_info("If the maximum dosage is exceeded, inform a member of your assigned vessel's medical staff immediately. Do not induce vomiting.")]" + . += "\t[span_info("Ingredients: each strip contains 500mg of Activin (dextro-methamphetamine). Other ingredients include Green Dye 450 (Verdant Meadow) and artificial herb flavouring.")]" + . += "\t[span_info("Storage: keep in a cool dry place. Do not use after the use-by date: 32/4/350.")]" + return . /obj/item/storage/box/gum/wake_up/PopulateContents() for(var/i in 1 to 4) diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index e2351b42da5..d23bce7e6f2 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -127,7 +127,7 @@ return FALSE var/obj/item/bodypart/head/the_head = target.get_bodypart(BODY_ZONE_HEAD) - if((target.get_biological_state() != BIO_FLESH_BONE && target.get_biological_state() != BIO_JUST_FLESH) || !the_head.is_organic_limb()) + if((target.get_biological_state() != BIO_FLESH_BONE && target.get_biological_state() != BIO_JUST_FLESH) || !IS_ORGANIC_LIMB(the_head)) to_chat(user, span_warning("You can't noogie [target], [target.p_they()] [target.p_have()] no skin on [target.p_their()] head!")) return diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index dcbee9ab9eb..1d0e70fec06 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -53,17 +53,17 @@ /obj/item/robot_suit/update_overlays() . = ..() if(l_arm) - . += "[l_arm.icon_state]+o" + . += "[initial(l_arm.icon_state)]+o" if(r_arm) - . += "[r_arm.icon_state]+o" + . += "[initial(r_arm.icon_state)]+o" if(chest) - . += "[chest.icon_state]+o" + . += "[initial(chest.icon_state)]+o" if(l_leg) - . += "[l_leg.icon_state]+o" + . += "[initial(l_leg.icon_state)]+o" if(r_leg) - . += "[r_leg.icon_state]+o" + . += "[initial(r_leg.icon_state)]+o" if(head) - . += "[head.icon_state]+o" + . += "[initial(head.icon_state)]+o" /obj/item/robot_suit/proc/check_completion() if(l_arm && r_arm && l_leg && r_leg && head && head.flash1 && head.flash2 && chest && chest.wired && chest.cell) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 177678675f7..961e3065f3c 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -83,17 +83,20 @@ if(!affecting) //Missing limb? to_chat(user, span_warning("[C] doesn't have \a [parse_zone(user.zone_selected)]!")) return FALSE - if(affecting.status != BODYPART_ORGANIC) //Limb must be organic to be healed - RR + if(!IS_ORGANIC_LIMB(affecting)) //Limb must be organic to be healed - RR to_chat(user, span_warning("[src] won't work on a robotic limb!")) return FALSE if(affecting.brute_dam && brute || affecting.burn_dam && burn) - user.visible_message("[user] applies [src] on [C]'s [affecting.name].", "You apply [src] on [C]'s [affecting.name].") + user.visible_message( + span_infoplain(span_green("[user] applies [src] on [C]'s [parse_zone(affecting.body_zone)].")), + span_infoplain(span_green("You apply [src] on [C]'s [parse_zone(affecting.body_zone)].")) + ) var/previous_damage = affecting.get_damage() if(affecting.heal_damage(brute, burn)) C.update_damage_overlays() post_heal_effects(max(previous_damage - affecting.get_damage(), 0), C, user) return TRUE - to_chat(user, span_warning("[C]'s [affecting.name] can not be healed with [src]!")) + to_chat(user, span_warning("[C]'s [parse_zone(affecting.body_zone)] can not be healed with [src]!")) return FALSE ///Override this proc for special post heal effects. diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 02c6b23eae8..acf400b1a9f 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -132,19 +132,18 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if(!ishuman(L)) return var/mob/living/carbon/human/H = L - for(var/X in H.bodyparts) - var/obj/item/bodypart/BP = X - if(BP.status == BODYPART_ROBOTIC) + for(var/obj/item/bodypart/bodypart as anything in H.bodyparts) + if(!IS_ORGANIC_LIMB(bodypart)) to_chat(user, span_warning("[src.deity_name] refuses to heal this metallic taint!")) return 0 var/heal_amt = 10 - var/list/hurt_limbs = H.get_damaged_bodyparts(1, 1, null, BODYPART_ORGANIC) + var/list/hurt_limbs = H.get_damaged_bodyparts(1, 1, null, BODYTYPE_ORGANIC) if(hurt_limbs.len) for(var/X in hurt_limbs) var/obj/item/bodypart/affecting = X - if(affecting.heal_damage(heal_amt, heal_amt, null, BODYPART_ORGANIC)) + if(affecting.heal_damage(heal_amt, heal_amt, null, BODYTYPE_ORGANIC)) H.update_damage_overlays() H.visible_message(span_notice("[user] heals [H] with the power of [deity_name]!")) to_chat(H, span_boldnotice("May the power of [deity_name] compel you to be healed!")) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 8a745b9a005..4d508d05597 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -120,7 +120,7 @@ var/obj/item/bodypart/affecting = attacked_humanoid.get_bodypart(check_zone(user.zone_selected)) - if(affecting && affecting.status == BODYPART_ROBOTIC && !user.combat_mode) + if(affecting && !IS_ORGANIC_LIMB(affecting) && !user.combat_mode) if(src.use_tool(attacked_humanoid, user, 0, volume=50, amount=1)) if(user == attacked_humanoid) user.visible_message(span_notice("[user] starts to fix some of the dents on [attacked_humanoid]'s [affecting.name]."), diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 7d961515105..054e586fbcc 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -49,7 +49,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) hairdresser.hairstyle = new_style - hairdresser.update_hair() + hairdresser.update_hair(is_creating = TRUE) /obj/structure/mirror/examine_status(mob/user) if(broken) @@ -216,7 +216,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return TRUE amazed_human.gender = FEMALE - amazed_human.body_type = FEMALE + amazed_human.physique = FEMALE to_chat(amazed_human, span_notice("Man, you feel like a woman!")) else return TRUE @@ -226,7 +226,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return TRUE amazed_human.gender = MALE - amazed_human.body_type = MALE + amazed_human.physique = MALE to_chat(amazed_human, span_notice("Whoa man, you feel like a man!")) else return TRUE diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index ec74131b52d..539d745b3ee 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -12,7 +12,7 @@ /proc/randomize_human(mob/living/carbon/human/H) H.gender = pick(MALE, FEMALE) - H.body_type = H.gender + H.physique = H.gender H.real_name = random_unique_name(H.gender) H.name = H.real_name H.underwear = random_underwear(H.gender) @@ -38,6 +38,5 @@ H.dna.features["moth_antennae"] = pick(GLOB.moth_antennae_list) H.dna.features["pod_hair"] = pick(GLOB.pod_hair_list) - H.update_body() - H.update_hair() - H.update_body_parts() + H.update_body(is_creating = TRUE) + H.update_hair(is_creating = TRUE) diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm index 7335c4fdb35..ba71d1f174c 100644 --- a/code/modules/antagonists/abductor/equipment/glands/heal.dm +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -53,7 +53,7 @@ if(!limb) replace_limb(zone) return - if((limb.get_damage() >= (limb.max_damage / 2)) || (limb.status == BODYPART_ROBOTIC)) + if((limb.get_damage() >= (limb.max_damage / 2)) || (!IS_ORGANIC_LIMB(limb))) replace_limb(zone, limb) return @@ -72,7 +72,7 @@ return var/obj/item/bodypart/chest/chest = owner.get_bodypart(BODY_ZONE_CHEST) - if((chest.get_damage() >= (chest.max_damage / 4)) || (chest.status == BODYPART_ROBOTIC)) + if((chest.get_damage() >= (chest.max_damage / 4)) || (!IS_ORGANIC_LIMB(chest))) replace_chest(chest) return @@ -208,7 +208,7 @@ addtimer(CALLBACK(src, .proc/keep_replacing_blood), 30) /obj/item/organ/heart/gland/heal/proc/replace_chest(obj/item/bodypart/chest/chest) - if(chest.status == BODYPART_ROBOTIC) + if(!IS_ORGANIC_LIMB(chest)) owner.visible_message(span_warning("[owner]'s [chest.name] rapidly expels its mechanical components, replacing them with flesh!"), span_userdanger("Your [chest.name] rapidly expels its mechanical components, replacing them with flesh!")) playsound(owner, 'sound/magic/clockwork/anima_fragment_attack.ogg', 50, TRUE) var/list/dirs = GLOB.alldirs.Copy() diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 8f9560c80c0..e23e5bdb476 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -652,9 +652,11 @@ chosen_dna.transfer_identity(user, TRUE) - user.Digitigrade_Leg_Swap(!(DIGITIGRADE in chosen_dna.species?.species_traits)) + for(var/obj/item/bodypart/limb as anything in user.bodyparts) + if(IS_ORGANIC_LIMB(limb)) + limb.update_limb(is_creating = TRUE) + user.updateappearance(mutcolor_update = TRUE) - user.update_body() user.domutcheck() // Get rid of any scars from previous Changeling-ing diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm index 835e13cfb36..05a58894cd9 100644 --- a/code/modules/antagonists/changeling/powers/fakedeath.dm +++ b/code/modules/antagonists/changeling/powers/fakedeath.dm @@ -43,7 +43,7 @@ "You hear organic matter ripping \ and tearing!") user.emote("scream") - user.regenerate_limbs(0, list(BODY_ZONE_HEAD)) + user.regenerate_limbs(list(BODY_ZONE_HEAD)) user.regenerate_organs() /datum/action/changeling/fakedeath/proc/ready_to_regenerate(mob/user) diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm index fffcb731bed..01109161dca 100644 --- a/code/modules/antagonists/changeling/powers/regenerate.dm +++ b/code/modules/antagonists/changeling/powers/regenerate.dm @@ -23,7 +23,7 @@ "You hear organic matter ripping \ and tearing!") C.emote("scream") - C.regenerate_limbs(1) + C.regenerate_limbs() if(!user.getorganslot(ORGAN_SLOT_BRAIN)) var/obj/item/organ/brain/B if(C.has_dna() && C.dna.species.mutantbrain) diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index 6400324c720..e32e1f2ce25 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -219,18 +219,6 @@ /obj/item/bountytrap = 4 ) -/datum/outfit/bountysynth/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - if(visualsOnly) - return - var/datum/species/synth/synthetic_appearance = new() - H.set_species(synthetic_appearance) - synthetic_appearance.assume_disguise(synthetic_appearance, H) - H.update_hair() - var/obj/item/card/id/W = H.wear_id - W.registered_name = H.real_name - W.update_label() - W.update_icon() - //ids and ert code /obj/item/card/id/advanced/bountyhunter diff --git a/code/modules/antagonists/heretic/structures/mawed_crucible.dm b/code/modules/antagonists/heretic/structures/mawed_crucible.dm index 32311eefada..adb7a64a5a5 100644 --- a/code/modules/antagonists/heretic/structures/mawed_crucible.dm +++ b/code/modules/antagonists/heretic/structures/mawed_crucible.dm @@ -75,7 +75,7 @@ if(istype(weapon, /obj/item/bodypart)) var/obj/item/bodypart/consumed = weapon - if(consumed.status != BODYPART_ORGANIC) + if(!IS_ORGANIC_LIMB(consumed)) balloon_alert(user, "not organic!") return diff --git a/code/modules/antagonists/nightmare/nightmare_species.dm b/code/modules/antagonists/nightmare/nightmare_species.dm index e273780f424..5b448b72187 100644 --- a/code/modules/antagonists/nightmare/nightmare_species.dm +++ b/code/modules/antagonists/nightmare/nightmare_species.dm @@ -4,7 +4,7 @@ /datum/species/shadow/nightmare name = "Nightmare" id = SPECIES_NIGHTMARE - limbs_id = "shadow" + examine_limb_id = "shadow" burnmod = 1.5 no_equip = list(ITEM_SLOT_MASK, ITEM_SLOT_OCLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_ICLOTHING, ITEM_SLOT_SUITSTORE) species_traits = list(NOBLOOD,NO_UNDERWEAR,NO_DNA_COPY,NOTRANSSTING,NOEYESPRITES) diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 86e4d2ce0e8..958626d39ff 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -356,8 +356,7 @@ if(iscarbon(mob)) if(ishuman(mob)) var/mob/living/carbon/human/H = mob - if(H.dna && H.dna.species) - H.dna.species.handle_hair(H,"#1d2953") //will be reset when blight is cured + H.set_haircolor("#1d2953", override = TRUE) //will be reset when blight is cured var/blightfound = FALSE for(var/datum/disease/revblight/blight in H.diseases) blightfound = TRUE diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index defe4a6c851..cd05d88dd9e 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -20,7 +20,7 @@ affected_mob.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#1d2953") if(affected_mob.dna && affected_mob.dna.species) affected_mob.dna.species.handle_mutant_bodyparts(affected_mob) - affected_mob.dna.species.handle_hair(affected_mob) + affected_mob.set_haircolor(null, override = TRUE) to_chat(affected_mob, span_notice("You feel better.")) ..() @@ -64,7 +64,7 @@ new /obj/effect/temp_visual/revenant(affected_mob.loc) if(affected_mob.dna && affected_mob.dna.species) affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953") - affected_mob.dna.species.handle_hair(affected_mob,"#1d2953") + affected_mob.set_haircolor("#1d2953", override = TRUE) affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("You suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) addtimer(CALLBACK(src, .proc/cure), 10 SECONDS) diff --git a/code/modules/antagonists/thief/thief.dm b/code/modules/antagonists/thief/thief.dm index b2fd7a4ea93..63a7618fb7a 100644 --- a/code/modules/antagonists/thief/thief.dm +++ b/code/modules/antagonists/thief/thief.dm @@ -100,7 +100,7 @@ if(SSatoms.initialized == INITIALIZATION_INSSATOMS) thief.w_uniform?.update_greyscale() thief.update_inv_w_uniform() - thief.body_type = FEMALE //update_body() and gender block or something + thief.physique = FEMALE //update_body() and gender block or something thief.hair_color = "#2A71DC" //hair color dna block thief.skin_tone = "caucasian2" //skin tone dna block thief.hairstyle = "Bun Head 2" //update_hair() diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 8c2deb4cbae..a7d07884a71 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -197,15 +197,15 @@ return var/mob/living/carbon/human/burn_human = burn_living var/datum/species/burn_species = burn_human.dna.species - if(istype(burn_species, /datum/species/plasmaman) || istype(burn_species, /datum/species/android) || istype(burn_species, /datum/species/synth)) //ignore plasmamen/robotic species + if(istype(burn_species, /datum/species/plasmaman) || istype(burn_species, /datum/species/android)) //ignore plasmamen/robotic species return var/list/plasma_parts = list()//a list of the organic parts to be turned into plasma limbs var/list/robo_parts = list()//keep a reference of robotic parts so we know if we can turn them into a plasmaman for(var/obj/item/bodypart/burn_limb as anything in burn_human.bodyparts) - if(burn_limb.status == BODYPART_ORGANIC && burn_limb.species_id != SPECIES_PLASMAMAN) //getting every organic, non-plasmaman limb (augments/androids are immune to this) + if(IS_ORGANIC_LIMB(burn_limb) && burn_limb.limb_id != SPECIES_PLASMAMAN) //getting every organic, non-plasmaman limb (augments/androids are immune to this) plasma_parts += burn_limb - if(burn_limb.status == BODYPART_ROBOTIC) + if(!IS_ORGANIC_LIMB(burn_limb)) robo_parts += burn_limb burn_human.adjustToxLoss(15) diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index 1c3272c11b4..140cc4d5fec 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -389,7 +389,8 @@ var/mob/living/carbon/human/M = new /mob/living/carbon/human(get_turf(src)) new_team_member.prefs.safe_transfer_prefs_to(M, is_antag = TRUE) - M.set_species(/datum/species/synth) + if(M.dna.species.outfit_important_for_life) + M.set_species(/datum/species/human) M.key = new_team_member.key M.faction += team M.equipOutfit(chosen_class) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 40f8cf8bb9f..0ac9d2b225f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -492,10 +492,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/character_preview_view) character.dna.real_name = character.real_name if(icon_updates) - character.icon_render_key = null //turns out if you don't set this to null update_body_parts does nothing, since it assumes the operation was cached - character.update_body() - character.update_hair() - character.update_body_parts() + character.icon_render_keys = list() + character.update_body(is_creating = TRUE) /// Returns whether the parent mob should have the random hardcore settings enabled. Assumes it has a mind. diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm index 4ef018fc60f..469b564e46f 100644 --- a/code/modules/client/preferences/body_type.dm +++ b/code/modules/client/preferences/body_type.dm @@ -14,9 +14,9 @@ /datum/preference/choiced/body_type/apply_to_human(mob/living/carbon/human/target, value) if (value == USE_GENDER) - target.body_type = target.gender + target.physique = target.gender else - target.body_type = value + target.physique = value /datum/preference/choiced/body_type/is_accessible(datum/preferences/preferences) if (!..(preferences)) diff --git a/code/modules/client/preferences/species.dm b/code/modules/client/preferences/species.dm index 2ad93c3b14b..c90b182f16c 100644 --- a/code/modules/client/preferences/species.dm +++ b/code/modules/client/preferences/species.dm @@ -6,7 +6,7 @@ randomize_by_default = FALSE /datum/preference/choiced/species/deserialize(input, datum/preferences/preferences) - return GLOB.species_list[sanitize_inlist(input, get_choices_serialized(), "human")] + return GLOB.species_list[sanitize_inlist(input, get_choices_serialized(), SPECIES_HUMAN)] /datum/preference/choiced/species/serialize(input) var/datum/species/species = input diff --git a/code/modules/client/preferences/species_features/basic.dm b/code/modules/client/preferences/species_features/basic.dm index bf208f36942..f75e12dd0d1 100644 --- a/code/modules/client/preferences/species_features/basic.dm +++ b/code/modules/client/preferences/species_features/basic.dm @@ -53,6 +53,7 @@ /datum/preference/choiced/facial_hairstyle/apply_to_human(mob/living/carbon/human/target, value) target.facial_hairstyle = value + target.update_hair(is_creating = TRUE) /datum/preference/choiced/facial_hairstyle/compile_constant_data() var/list/data = ..() @@ -69,6 +70,7 @@ /datum/preference/color/facial_hair_color/apply_to_human(mob/living/carbon/human/target, value) target.facial_hair_color = value + target.update_hair(is_creating = TRUE) /datum/preference/choiced/facial_hair_gradient category = PREFERENCE_CATEGORY_SECONDARY_FEATURES @@ -82,7 +84,7 @@ /datum/preference/choiced/facial_hair_gradient/apply_to_human(mob/living/carbon/human/target, value) LAZYSETLEN(target.grad_style, GRADIENTS_LEN) target.grad_style[GRADIENT_FACIAL_HAIR_KEY] = value - target.update_hair() + target.update_hair(is_creating = TRUE) /datum/preference/choiced/facial_hair_gradient/create_default_value() return "None" @@ -96,7 +98,7 @@ /datum/preference/color/facial_hair_gradient/apply_to_human(mob/living/carbon/human/target, value) LAZYSETLEN(target.grad_color, GRADIENTS_LEN) target.grad_color[GRADIENT_FACIAL_HAIR_KEY] = value - target.update_hair() + target.update_hair(is_creating = TRUE) /datum/preference/color/facial_hair_gradient/is_accessible(datum/preferences/preferences) if (!..(preferences)) @@ -145,7 +147,7 @@ /datum/preference/choiced/hair_gradient/apply_to_human(mob/living/carbon/human/target, value) LAZYSETLEN(target.grad_style, GRADIENTS_LEN) target.grad_style[GRADIENT_HAIR_KEY] = value - target.update_hair() + target.update_hair(is_creating = TRUE) /datum/preference/choiced/hair_gradient/create_default_value() return "None" @@ -159,7 +161,7 @@ /datum/preference/color/hair_gradient/apply_to_human(mob/living/carbon/human/target, value) LAZYSETLEN(target.grad_color, GRADIENTS_LEN) target.grad_color[GRADIENT_HAIR_KEY] = value - target.update_hair() + target.update_hair(is_creating = TRUE) /datum/preference/color/hair_gradient/is_accessible(datum/preferences/preferences) if (!..(preferences)) diff --git a/code/modules/client/preferences/species_features/ethereal.dm b/code/modules/client/preferences/species_features/ethereal.dm index dfd7afb06a9..61818aee2d0 100644 --- a/code/modules/client/preferences/species_features/ethereal.dm +++ b/code/modules/client/preferences/species_features/ethereal.dm @@ -8,10 +8,10 @@ /datum/preference/choiced/ethereal_color/init_possible_values() var/list/values = list() - var/icon/ethereal_base = icon('icons/mob/human_parts_greyscale.dmi', "ethereal_head_m") - ethereal_base.Blend(icon('icons/mob/human_parts_greyscale.dmi', "ethereal_chest_m"), ICON_OVERLAY) - ethereal_base.Blend(icon('icons/mob/human_parts_greyscale.dmi', "ethereal_l_arm"), ICON_OVERLAY) - ethereal_base.Blend(icon('icons/mob/human_parts_greyscale.dmi', "ethereal_r_arm"), ICON_OVERLAY) + var/icon/ethereal_base = icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_head") + ethereal_base.Blend(icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_chest"), ICON_OVERLAY) + ethereal_base.Blend(icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_l_arm"), ICON_OVERLAY) + ethereal_base.Blend(icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_r_arm"), ICON_OVERLAY) var/icon/eyes = icon('icons/mob/human_face.dmi', "eyes") eyes.Blend(COLOR_BLACK, ICON_MULTIPLY) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 898ec327c43..579fc64ac25 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -173,7 +173,7 @@ /obj/item/clothing/proc/take_damage_zone(def_zone, damage_amount, damage_type, armour_penetration) if(!def_zone || !limb_integrity || (initial(body_parts_covered) in GLOB.bitflags)) // the second check sees if we only cover one bodypart anyway and don't need to bother with this return - var/list/covered_limbs = body_parts_covered2organ_names(body_parts_covered) // what do we actually cover? + var/list/covered_limbs = cover_flags2body_zones(body_parts_covered) // what do we actually cover? if(!(def_zone in covered_limbs)) return @@ -195,7 +195,7 @@ * * damage_type: Only really relevant for the verb for describing the breaking, and maybe atom_destruction() */ /obj/item/clothing/proc/disable_zone(def_zone, damage_type) - var/list/covered_limbs = body_parts_covered2organ_names(body_parts_covered) + var/list/covered_limbs = cover_flags2body_zones(body_parts_covered) if(!(def_zone in covered_limbs)) return @@ -208,7 +208,7 @@ RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/bristle, override = TRUE) zones_disabled++ - for(var/i in zone2body_parts_covered(def_zone)) + for(var/i in body_zone2cover_flags(def_zone)) body_parts_covered &= ~i if(body_parts_covered == NONE) // if there are no more parts to break then the whole thing is kaput diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 60fcada6d47..6b26fb6697e 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -20,7 +20,6 @@ var/alt_covers_chest = FALSE // for adjusted/rolled-down jumpsuits, FALSE = exposes chest and arms, TRUE = exposes arms only var/obj/item/clothing/accessory/attached_accessory var/mutable_appearance/accessory_overlay - var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to. var/freshly_laundered = FALSE /obj/item/clothing/under/Initialize(mapload) @@ -98,9 +97,9 @@ if(!alt_covers_chest) body_parts_covered |= CHEST - if(mutantrace_variation && ishuman(user)) + if((supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION) && ishuman(user)) var/mob/living/carbon/human/H = user - if(DIGITIGRADE in H.dna.species.species_traits) + if(H.dna.species.bodytype & BODYTYPE_DIGITIGRADE) adjusted = DIGITIGRADE_STYLE H.update_inv_w_uniform() @@ -323,7 +322,7 @@ return adjusted for(var/zone in list(BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) // ugly check to make sure we don't reenable protection on a disabled part if(damage_by_parts[zone] > limb_integrity) - for(var/part in zone2body_parts_covered(zone)) + for(var/part in body_zone2cover_flags(zone)) body_parts_covered &= part return adjusted diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index d68f4b9e141..4c8d6b06f8e 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -16,6 +16,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/cargo/tech name = "cargo technician's jumpsuit" @@ -23,16 +24,17 @@ icon_state = "cargotech" inhand_icon_state = "lb_suit" body_parts_covered = CHEST|GROIN|ARMS - mutantrace_variation = MUTANTRACE_VARIATION + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION alt_covers_chest = TRUE + /obj/item/clothing/under/rank/cargo/tech/skirt name = "cargo technician's jumpskirt" desc = "Skiiiiirts! They're comfy and easy to wear!" icon_state = "cargo_skirt" inhand_icon_state = "lb_suit" body_parts_covered = CHEST|GROIN|ARMS - mutantrace_variation = NO_MUTANTRACE_VARIATION + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 66d3a772eb9..044e9587f9b 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -25,6 +25,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/chaplain desc = "It's a black jumpsuit, often worn by religious folk." @@ -41,6 +42,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/chef name = "cook's suit" @@ -55,6 +57,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/head_of_personnel desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." @@ -70,6 +73,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/head_of_personnel/suit name = "head of personnel's suit" @@ -86,6 +90,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/hydroponics desc = "It's a jumpsuit designed to protect against minor plant-related hazards." @@ -102,6 +107,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/janitor desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." @@ -116,6 +122,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/janitor/maid name = "maid uniform" @@ -148,6 +155,7 @@ inhand_icon_state = "lawyer_black" dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/lawyer/beige name = "good lawyer's suit" @@ -164,6 +172,7 @@ worn_icon = 'icons/mob/clothing/under/suits.dmi' dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/lawyer/red name = "lawyer red suit" @@ -176,6 +185,7 @@ inhand_icon_state = "lawyer_red" dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/lawyer/blue name = "lawyer blue suit" @@ -188,6 +198,7 @@ inhand_icon_state = "lawyer_blue" dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/lawyer/bluesuit name = "blue suit" @@ -205,6 +216,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/lawyer/purpsuit name = "purple suit" @@ -221,6 +233,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/lawyer/galaxy worn_icon = 'icons/mob/clothing/under/lawyer_galaxy.dmi' diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index 5c8f3c52cd9..b779d7504f0 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -13,6 +13,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/mime/sexy name = "sexy mime outfit" diff --git a/code/modules/clothing/under/jobs/civilian/curator.dm b/code/modules/clothing/under/jobs/civilian/curator.dm index 86a8683d56f..f9d822d6130 100644 --- a/code/modules/clothing/under/jobs/civilian/curator.dm +++ b/code/modules/clothing/under/jobs/civilian/curator.dm @@ -18,6 +18,7 @@ can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/civilian/curator/treasure_hunter name = "treasure hunter uniform" diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index dbf33c259fc..42580be448d 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -33,6 +33,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/captain/parade name = "captain's parade uniform" diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 3ae5668db3c..bd95efc8830 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -21,6 +21,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/engineering/atmospheric_technician desc = "It's a jumpsuit worn by atmospheric technicians. Made from fire resistant materials." @@ -36,6 +37,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/engineering/engineer desc = "It's an orange high visibility jumpsuit worn by engineers. Made from fire resistant materials." @@ -59,3 +61,4 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 652634ae053..251ec3d3a69 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -18,6 +18,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/medical/chief_medical_officer desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." @@ -33,6 +34,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck name = "chief medical officer's turtleneck" @@ -51,6 +53,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/medical/virologist desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." @@ -66,6 +69,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/medical/scrubs name = "medical scrubs" @@ -98,6 +102,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/medical/paramedic desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." @@ -114,6 +119,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/medical/doctor/nurse desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index ed1a2d3ae78..1d657056b76 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -23,6 +23,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/rnd/research_director/alt desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants." @@ -40,6 +41,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/rnd/research_director/turtleneck desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style." @@ -57,6 +59,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/rnd/scientist desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist." @@ -73,6 +76,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/rnd/roboticist desc = "It's a slimming black with reinforced seams; great for industrial work." @@ -89,6 +93,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/rnd/geneticist desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." @@ -106,3 +111,4 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 661603703ce..b946e27e55f 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -37,6 +37,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/officer/blueshirt name = "blue shirt and tie" @@ -81,6 +82,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/warden/formal desc = "The insignia on this uniform tells you that this uniform belongs to the Warden." @@ -108,6 +110,7 @@ dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY alt_covers_chest = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/detective/noir name = "noir suit" @@ -125,6 +128,7 @@ dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY alt_covers_chest = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /* * Head of Security @@ -145,6 +149,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/head_of_security/grey name = "head of security's grey jumpsuit" @@ -168,6 +173,7 @@ dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY alt_covers_chest = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/head_of_security/parade name = "head of security's parade uniform" @@ -228,6 +234,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/officer/beatcop name = "space police uniform" diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index d523b63b014..6c409b98ca1 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -4,7 +4,7 @@ gender = PLURAL body_parts_covered = GROIN female_sprite_flags = NO_FEMALE_UNIFORM - mutantrace_variation = MUTANTRACE_VARIATION + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION can_adjust = FALSE icon = 'icons/obj/clothing/under/shorts_pants.dmi' worn_icon = 'icons/mob/clothing/under/shorts_pants.dmi' diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index f3a7521b804..e5b964ca2f7 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -2,6 +2,7 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY can_adjust = FALSE body_parts_covered = CHEST|GROIN + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON icon = 'icons/obj/clothing/under/dress.dmi' worn_icon = 'icons/mob/clothing/under/dress.dmi' diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index a9cbc662580..f148cc16683 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -18,6 +18,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/suit/sl desc = "It's a very amish looking suit." @@ -53,6 +54,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/suit/black_really name = "executive suit" @@ -68,6 +70,7 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/suit/green name = "green suit" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 426d992c538..5ed37be56b8 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -19,6 +19,7 @@ alt_covers_chest = TRUE female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY dying_key = DYE_REGISTRY_JUMPSKIRT + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/syndicate/bloodred name = "blood-red sneaksuit" @@ -51,6 +52,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40) female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY dying_key = DYE_REGISTRY_JUMPSKIRT + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/syndicate/sniper name = "tactical turtleneck suit" diff --git a/code/modules/games/wizoff.dm b/code/modules/games/wizoff.dm index 05044ea392d..73be649593a 100644 --- a/code/modules/games/wizoff.dm +++ b/code/modules/games/wizoff.dm @@ -13,13 +13,14 @@ cards += generate_card("[card]") /obj/item/toy/cards/deck/wizoff/examine_more(mob/user) - var/list/msg = list(span_notice("Remember the rules of Wiz-Off!")) - msg += "\t[span_info("Each player draws 5 cards.")]" - msg += "\t[span_info("There are five rounds. Each round, a player selects a card to play, and the winner is selected based on the following rules:")]" - msg += "\t[span_info("Defensive beats Offensive!")]" - msg += "\t[span_info("Offensive beats Utility!")]" - msg += "\t[span_info("Utility beats Defensive!")]" - msg += "\t[span_info("If both players play the same type of spell, the higher number wins!")]" - msg += "\t[span_info("The player who wins the most of the 5 rounds wins the game!")]" - msg += "\t[span_notice("Now get ready to battle for the fate of the universe: Wiz-Off!")]" - return msg + . = ..() + . += span_notice("Remember the rules of Wiz-Off!") + . += "\t[span_info("Each player draws 5 cards.")]" + . += "\t[span_info("There are five rounds. Each round, a player selects a card to play, and the winner is selected based on the following rules:")]" + . += "\t[span_info("Defensive beats Offensive!")]" + . += "\t[span_info("Offensive beats Utility!")]" + . += "\t[span_info("Utility beats Defensive!")]" + . += "\t[span_info("If both players play the same type of spell, the higher number wins!")]" + . += "\t[span_info("The player who wins the most of the 5 rounds wins the game!")]" + . += "\t[span_notice("Now get ready to battle for the fate of the universe: Wiz-Off!")]" + return . diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index df2e891e04c..9d187a823f2 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -445,7 +445,7 @@ if(require_human) player_client.prefs.randomise["species"] = FALSE player_client.prefs.safe_transfer_prefs_to(src, TRUE, is_antag) - if (require_human && !ishumanbasic(src)) + if(require_human && !ishumanbasic(src)) set_species(/datum/species/human) dna.species.roundstart_changed = TRUE apply_pref_name(/datum/preference/name/backup_human, player_client) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 6fb0f9e3043..2f6eb869f3b 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -202,7 +202,7 @@ worn_icon_state = "[base_icon_state]_impregnated" var/obj/item/bodypart/chest/LC = target.get_bodypart(BODY_ZONE_CHEST) - if((!LC || LC.status != BODYPART_ROBOTIC) && !target.getorgan(/obj/item/organ/body_egg/alien_embryo)) + if((!LC || IS_ORGANIC_LIMB(LC)) && !target.getorgan(/obj/item/organ/body_egg/alien_embryo)) new /obj/item/organ/body_egg/alien_embryo(target) var/turf/T = get_turf(target) log_game("[key_name(target)] was impregnated by a facehugger at [loc_name(T)]") diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c13b54af5e3..f4801021327 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1,7 +1,6 @@ /mob/living/carbon/Initialize(mapload) . = ..() create_reagents(1000, REAGENT_HOLDER_ALIVE) - assign_bodypart_ownership() update_body_parts() //to update the carbon's new bodyparts appearance register_context() @@ -348,7 +347,7 @@ return FALSE visible_message(span_danger("[src] manages to [cuff_break ? "break" : "remove"] [I]!")) to_chat(src, span_notice("You successfully [cuff_break ? "break" : "remove"] [I].")) - + if(cuff_break) . = !((I == handcuffed) || (I == legcuffed)) qdel(I) @@ -1000,6 +999,7 @@ ///Proc to hook behavior on bodypart additions. /mob/living/carbon/proc/add_bodypart(obj/item/bodypart/new_bodypart) bodyparts += new_bodypart + new_bodypart.owner = src switch(new_bodypart.body_part) if(LEG_LEFT, LEG_RIGHT) @@ -1015,7 +1015,6 @@ ///Proc to hook behavior on bodypart removals. /mob/living/carbon/proc/remove_bodypart(obj/item/bodypart/old_bodypart) bodyparts -= old_bodypart - switch(old_bodypart.body_part) if(LEG_LEFT, LEG_RIGHT) set_num_legs(num_legs - 1) @@ -1049,43 +1048,52 @@ if(href_list[VV_HK_MODIFY_BODYPART]) if(!check_rights(R_SPAWN)) return - var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("add","remove", "augment") + var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("replace","remove") if(!edit_action) return var/list/limb_list = list() - if(edit_action == "remove" || edit_action == "augment") - for(var/obj/item/bodypart/B in bodyparts) + if(edit_action == "remove") + for(var/obj/item/bodypart/B as anything in bodyparts) limb_list += B.body_zone - if(edit_action == "remove") limb_list -= BODY_ZONE_CHEST else - limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - for(var/obj/item/bodypart/B in bodyparts) - limb_list -= B.body_zone - var/result = input(usr, "Please choose which body part to [edit_action]","[capitalize(edit_action)] Body Part") as null|anything in sort_list(limb_list) + limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_CHEST) + var/result = input(usr, "Please choose which bodypart to [edit_action]","[capitalize(edit_action)] Bodypart") as null|anything in sort_list(limb_list) if(result) var/obj/item/bodypart/BP = get_bodypart(result) + var/list/limbtypes = list() + switch(result) + if(BODY_ZONE_CHEST) + limbtypes = typesof(/obj/item/bodypart/chest) + if(BODY_ZONE_R_ARM) + limbtypes = typesof(/obj/item/bodypart/r_arm) + if(BODY_ZONE_L_ARM) + limbtypes = typesof(/obj/item/bodypart/l_arm) + if(BODY_ZONE_HEAD) + limbtypes = typesof(/obj/item/bodypart/head) + if(BODY_ZONE_L_LEG) + limbtypes = typesof(/obj/item/bodypart/l_leg) + if(BODY_ZONE_R_LEG) + limbtypes = typesof(/obj/item/bodypart/r_leg) switch(edit_action) if("remove") if(BP) - BP.drop_limb() + BP.drop_limb(special = TRUE) + admin_ticket_log("[key_name_admin(usr)] has removed [src]'s [parse_zone(BP.body_zone)]") else to_chat(usr, span_boldwarning("[src] doesn't have such bodypart.")) - if("add") - if(BP) - to_chat(usr, span_boldwarning("[src] already has such bodypart.")) + admin_ticket_log("[key_name_admin(usr)] has attempted to modify the bodyparts of [src]") + if("replace") + var/limb2add = input(usr, "Select a bodypart type to add", "Add/Replace Bodypart") as null|anything in sort_list(limbtypes) + var/obj/item/bodypart/new_bp = new limb2add() + + if(new_bp.replace_limb(src, special = TRUE)) + admin_ticket_log("key_name_admin(usr)] has replaced [src]'s [BP.type] with [new_bp.type]") + qdel(BP) else - if(!regenerate_limb(result)) - to_chat(usr, span_boldwarning("[src] cannot have such bodypart.")) - if("augment") - if(ishuman(src)) - if(BP) - BP.change_bodypart_status(BODYPART_ROBOTIC, TRUE, TRUE) - else - to_chat(usr, span_boldwarning("[src] doesn't have such bodypart.")) - else - to_chat(usr, span_boldwarning("Only humans can be augmented.")) - admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [src]") + to_chat(usr, "Failed to replace bodypart! They might be incompatible.") + admin_ticket_log("[key_name_admin(usr)] has attempted to modify the bodyparts of [src]") + if(href_list[VV_HK_MAKE_AI]) if(!check_rights(R_SPAWN)) return diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index f4962699cc3..6f2abf2eda5 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -82,11 +82,11 @@ if(!affecting) //missing limb? we select the first bodypart (you can never have zero, because of chest) affecting = bodyparts[1] SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting) - send_item_attack_message(I, user, affecting.name, affecting) + send_item_attack_message(I, user, parse_zone(affecting.body_zone), affecting) if(I.force) var/attack_direction = get_dir(user, src) apply_damage(I.force, I.damtype, affecting, wound_bonus = I.wound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness(), attack_direction = attack_direction) - if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC) + if(I.damtype == BRUTE && IS_ORGANIC_LIMB(affecting)) if(prob(33)) I.add_mob_blood(src) var/turf/location = get_turf(src) @@ -643,7 +643,7 @@ . = health for (var/_limb in bodyparts) var/obj/item/bodypart/limb = _limb - if (limb.status != BODYPART_ORGANIC) + if (IS_ORGANIC_LIMB(limb)) . += (limb.brute_dam * limb.body_damage_coeff) + (limb.burn_dam * limb.body_damage_coeff) /mob/living/carbon/grabbedby(mob/living/carbon/user, supress_message = FALSE) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 6c0bab0bed7..6426cdb8f7f 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -74,7 +74,8 @@ /// A collection of arms (or actually whatever the fug /bodyparts you monsters use to wreck my systems) var/list/hand_bodyparts = list() - var/icon_render_key = "" + ///A cache of bodypart = icon to prevent excessive icon creation. + var/list/icon_render_keys = list() var/static/list/limb_icon_cache = list() //halucination vars diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 4bd940c9e9f..483582ed7af 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -40,10 +40,12 @@ /mob/living/carbon/regenerate_icons() if(notransform) return 1 + icon_render_keys = list() //Clear this bad larry out update_inv_hands() update_inv_handcuffed() update_inv_legcuffed() update_fire() + update_body_parts() /mob/living/carbon/update_inv_hands() @@ -226,85 +228,110 @@ . += emissive_blocker(standing.icon, standing.icon_state, alpha = standing.alpha) -/mob/living/carbon/update_body() - update_body_parts() +/mob/living/carbon/update_body(is_creating) + update_body_parts(is_creating) -/mob/living/carbon/proc/assign_bodypart_ownership() - for(var/X in bodyparts) - var/obj/item/bodypart/BP = X - BP.original_owner = WEAKREF(src) +///Checks to see if any bodyparts need to be redrawn, then does so. update_limb_data = TRUE redraws the limbs to conform to the owner. +/mob/living/carbon/proc/update_body_parts(update_limb_data) + update_damage_overlays() + update_wound_overlays() + var/list/needs_update = list() + var/limb_count_update = FALSE + for(var/obj/item/bodypart/limb as anything in bodyparts) + limb.update_limb(is_creating = update_limb_data) //Update limb actually doesn't do much, get_limb_icon is the cpu eater. + var/old_key = icon_render_keys?[limb.body_zone] //Checks the mob's icon render key list for the bodypart + icon_render_keys[limb.body_zone] = (limb.is_husked) ? limb.generate_husk_key().Join() : limb.generate_icon_key().Join() //Generates a key for the current bodypart + if(!(icon_render_keys[limb.body_zone] == old_key)) //If the keys match, that means the limb doesn't need to be redrawn + needs_update += limb -/mob/living/carbon/proc/update_body_parts() - //CHECK FOR UPDATE - var/oldkey = icon_render_key - icon_render_key = generate_icon_render_key() - if(oldkey == icon_render_key) + + var/list/missing_bodyparts = get_missing_limbs() + if(((dna ? dna.species.max_bodypart_count : BODYPARTS_DEFAULT_MAXIMUM) - icon_render_keys.len) != missing_bodyparts.len) //Checks to see if the target gained or lost any limbs. + limb_count_update = TRUE + for(var/missing_limb in missing_bodyparts) + icon_render_keys -= missing_limb //Removes dismembered limbs from the key list + + if(!needs_update.len && !limb_count_update) return remove_overlay(BODYPARTS_LAYER) - for(var/X in bodyparts) - var/obj/item/bodypart/BP = X - BP.update_limb() - - //LOAD ICONS - if(limb_icon_cache[icon_render_key]) - load_limb_from_cache() - return - //GENERATE NEW LIMBS var/list/new_limbs = list() - var/draw_features = !HAS_TRAIT(src, TRAIT_INVISIBLE_MAN) - for(var/X in bodyparts) - var/obj/item/bodypart/BP = X - new_limbs += BP.get_limb_icon(draw_external_organs = draw_features) + for(var/obj/item/bodypart/limb as anything in bodyparts) + if(limb in needs_update) //Checks to see if the limb needs to be redrawn + var/bodypart_icon = limb.get_limb_icon() + new_limbs += bodypart_icon + limb_icon_cache[icon_render_keys[limb.body_zone]] = bodypart_icon //Caches the icon with the bodypart key, as it is new + else + new_limbs += limb_icon_cache[icon_render_keys[limb.body_zone]] //Pulls existing sprites from the cache + if(new_limbs.len) overlays_standing[BODYPARTS_LAYER] = new_limbs - limb_icon_cache[icon_render_key] = new_limbs apply_overlay(BODYPARTS_LAYER) - update_damage_overlays() - update_wound_overlays() -///////////////////// -// Limb Icon Cache // -///////////////////// -/* - Called from update_body_parts() these procs handle the limb icon cache. - the limb icon cache adds an icon_render_key to a human mob, it represents: - - skin_tone (if applicable) - - gender - - limbs (stores as the limb name and whether it is removed/fine, organic/robotic) - These procs only store limbs as to increase the number of matching icon_render_keys - This cache exists because drawing 6/7 icons for humans constantly is quite a waste - See RemieRichards on irc.rizon.net #coderbus (RIP remie :sob:) -*/ +///////////////////////// +// Limb Icon Cache 2.0 // +///////////////////////// +/** + * Called from update_body_parts() these procs handle the limb icon cache. + * the limb icon cache adds an icon_render_key to a human mob, it represents: + * - Gender, if applicable + * - The ID of the limb + * - Draw color, if applicable + * These procs only store limbs as to increase the number of matching icon_render_keys + * This cache exists because drawing 6/7 icons for humans constantly is quite a waste + * See RemieRichards on irc.rizon.net #coderbus (RIP remie :sob:) +**/ +/obj/item/bodypart/proc/generate_icon_key() + RETURN_TYPE(/list) + . = list() + if(is_dimorphic) + . += "[limb_gender]-" + . += "[limb_id]" + . += "-[body_zone]" + if(should_draw_greyscale && draw_color) + . += "-[draw_color]" + for(var/obj/item/organ/external/external_organ as anything in external_organs) + if(!external_organ.can_draw_on_bodypart(owner)) + continue + . += "-[external_organ.generate_icon_cache()]" -//produces a key based on the mob's limbs + return . -/mob/living/carbon/proc/generate_icon_render_key() - for(var/X in bodyparts) - var/obj/item/bodypart/BP = X - . += "-[BP.body_zone]" - if(BP.use_digitigrade) - . += "-digitigrade[BP.use_digitigrade]" - if(BP.animal_origin) - . += "-[BP.animal_origin]" - if(BP.status == BODYPART_ORGANIC) - . += "-organic" - else - . += "-robotic" +///Generates a cache key specifically for husks +/obj/item/bodypart/proc/generate_husk_key() + RETURN_TYPE(/list) + . = list() + . += "[husk_type]" + . += "-husk" + . += "-[body_zone]" + return . - if(HAS_TRAIT(src, TRAIT_HUSK)) - . += "-husk" +/obj/item/bodypart/head/generate_icon_key() + . = ..() + . += "-[facial_hairstyle]" + . += "-[facial_hair_color]" + if(facial_hair_gradient_style) + . += "-[facial_hair_gradient_style]" + if(hair_gradient_color) + . += "-[facial_hair_gradient_color]" + if(facial_hair_hidden) + . += "-FACIAL_HAIR_HIDDEN" + if(show_debrained) + . += "-SHOW_DEBRAINED" + return . + . += "-[hair_style]" + . += "-[fixed_hair_color || override_hair_color || hair_color]" + if(hair_gradient_style) + . += "-[hair_gradient_style]" + if(hair_gradient_color) + . += "-[hair_gradient_color]" + if(hair_hidden) + . += "-HAIR_HIDDEN" -//change the mob's icon to the one matching its key -/mob/living/carbon/proc/load_limb_from_cache() - if(limb_icon_cache[icon_render_key]) - remove_overlay(BODYPARTS_LAYER) - overlays_standing[BODYPARTS_LAYER] = limb_icon_cache[icon_render_key] - apply_overlay(BODYPARTS_LAYER) - update_damage_overlays() + return . diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 65d410c314c..bac5a8dcc38 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -68,7 +68,7 @@ if(amount > 0) take_overall_damage(amount, 0, 0, updating_health, required_status) else - heal_overall_damage(abs(amount), 0, 0, required_status ? required_status : BODYPART_ORGANIC, updating_health) + heal_overall_damage(abs(amount), 0, 0, required_status ? required_status : BODYTYPE_ORGANIC, updating_health) return amount /mob/living/carbon/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_status) @@ -77,7 +77,7 @@ if(amount > 0) take_overall_damage(0, amount, 0, updating_health, required_status) else - heal_overall_damage(0, abs(amount), 0, required_status ? required_status : BODYPART_ORGANIC, updating_health) + heal_overall_damage(0, abs(amount), 0, required_status ? required_status : BODYTYPE_ORGANIC, updating_health) return amount /mob/living/carbon/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) @@ -159,7 +159,7 @@ var/list/obj/item/bodypart/parts = list() for(var/X in bodyparts) var/obj/item/bodypart/BP = X - if(status && (BP.status != status)) + if(status && !(BP.bodytype & status)) continue if((brute && BP.brute_dam) || (burn && BP.burn_dam) || (stamina && BP.stamina_dam)) parts += BP @@ -170,7 +170,7 @@ var/list/obj/item/bodypart/parts = list() for(var/X in bodyparts) var/obj/item/bodypart/BP = X - if(status && (BP.status != status)) + if(status && !(BP.bodytype & status)) continue if(BP.brute_dam + BP.burn_dam < BP.max_damage) parts += BP diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 2b8d710bb60..c12be3b336f 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -155,8 +155,16 @@ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) /mob/living/carbon/examine_more(mob/user) - if(!all_scars) - return ..() + . = ..() + . += span_notice("You examine [src] closer, and note the following...") + + //On closer inspection, this man isnt a man at all! + var/list/covered_zones = get_covered_body_zones() + for(var/obj/item/bodypart/part as anything in bodyparts) + if(part.body_zone in covered_zones) + continue + if(part.limb_id != (dna.species.examine_limb_id ? dna.species.examine_limb_id : dna.species.id)) + . += "[span_info("[p_they(TRUE)] [p_have()] \an [part.name].")]" var/list/visible_scars for(var/i in all_scars) @@ -164,14 +172,10 @@ if(S.is_visible(user)) LAZYADD(visible_scars, S) - if(!visible_scars) - return ..() - - var/msg = list(span_notice("You examine [src] closer, and note the following...")) for(var/i in visible_scars) var/datum/scar/S = i var/scar_text = S.get_examine_description(user) if(scar_text) - msg += "[scar_text]" + . += "[scar_text]" - return msg + return . diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 7d26e1384ee..4b13f71cf3a 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -46,7 +46,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) //Instead of just deleting our equipment, we save what we can and reinsert it into SSwardrobe's store //Hopefully this makes preference reloading not the worst thing ever /mob/living/carbon/human/dummy/delete_equipment() - var/list/items_to_check = get_all_slots() + held_items + var/list/items_to_check = get_all_worn_items() + held_items var/list/to_nuke = list() //List of items queued for deletion, can't qdel them before iterating their contents in case they hold something ///Travel to the bottom of the contents chain, expanding it out for(var/i = 1; i <= length(items_to_check); i++) //Needs to be a c style loop since it can expand diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d2143b6f4e1..77dda59a920 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -9,15 +9,18 @@ var/t_es = p_es() var/obscure_name + var/obscured = check_obscured_slots() + var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) + if(isliving(user)) var/mob/living/L = user if(HAS_TRAIT(L, TRAIT_PROSOPAGNOSIA) || HAS_TRAIT(L, TRAIT_INVISIBLE_MAN)) obscure_name = TRUE - . = list("*---------*\nThis is [!obscure_name ? name : "Unknown"]!") - - var/obscured = check_obscured_slots() - var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) + var/apparent_species + if(dna?.species && !skipface) + apparent_species = ", \an [dna.species.name]" + . = list("*---------*\nThis is [!obscure_name ? name : "Unknown"][apparent_species]!") //uniform if(w_uniform && !(obscured & ITEM_SLOT_ICLOTHING) && !(w_uniform.item_flags & EXAMINE_SKIP)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 0bf5ae9fe6f..1868c8cff46 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -8,6 +8,7 @@ create_bodyparts() setup_human_dna() + prepare_huds() //Prevents a nasty runtime on human init if(dna.species) INVOKE_ASYNC(src, .proc/set_species, dna.species.type) @@ -473,8 +474,7 @@ facial_hairstyle = "Shaved" hairstyle = pick("Bedhead", "Bedhead 2", "Bedhead 3") underwear = "Nude" - update_body() - update_hair() + update_body(is_creating = TRUE) /mob/living/carbon/human/singularity_pull(S, current_size) ..() @@ -1147,12 +1147,6 @@ /mob/living/carbon/human/species/snail race = /datum/species/snail -/mob/living/carbon/human/species/synth - race = /datum/species/synth - -/mob/living/carbon/human/species/synth/military - race = /datum/species/synth/military - /mob/living/carbon/human/species/vampire race = /datum/species/vampire @@ -1161,6 +1155,3 @@ /mob/living/carbon/human/species/zombie/infectious race = /datum/species/zombie/infectious - -/mob/living/carbon/human/species/zombie/krokodil_addict - race = /datum/species/krokodil_addict diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index e6ab4dd5796..3ee611c243c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -478,7 +478,7 @@ for(var/X in bodyparts) var/obj/item/bodypart/BP = X if(prob(probability) && !prob(getarmor(BP, BOMB)) && BP.body_zone != BODY_ZONE_HEAD && BP.body_zone != BODY_ZONE_CHEST) - BP.brute_dam = BP.max_damage + BP.receive_damage(INFINITY, wound_bonus = CANT_WOUND) //Capped by proc BP.dismember() max_limb_loss-- if(!max_limb_loss) @@ -529,8 +529,8 @@ if(. & EMP_PROTECT_CONTENTS) return var/informed = FALSE - for(var/obj/item/bodypart/L in src.bodyparts) - if(L.status == BODYPART_ROBOTIC) + for(var/obj/item/bodypart/L as anything in src.bodyparts) + if(!IS_ORGANIC_LIMB(L)) if(!informed) to_chat(src, span_userdanger("You feel a sharp pain as your robotic limbs overload.")) informed = TRUE diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index e2d6e85bcb2..102d3475e36 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -69,7 +69,7 @@ var/hardcore_survival_score = 0 /// Which body type to use - var/body_type = MALE + var/physique = MALE /// How many "units of blood" we have on our hands var/blood_in_hands = 0 diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index e42da6b6bc9..f07c313a37b 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -1,3 +1,5 @@ +#define RESOLVE_ICON_STATE(worn_item) (worn_item.worn_icon_state || worn_item.icon_state) + /////////////////////// //UPDATE_ICONS SYSTEM// /////////////////////// @@ -6,7 +8,7 @@ This system allows you to update individual mob-overlays, without regenerating t When we generate overlays we generate the standing version and then rotate the mob as necessary.. As of the time of writing there are 20 layers within this list. Please try to keep this from increasing. //22 and counting, good job guys - var/overlays_standing[20] //For the standing stance + var/overlays_standing[20] //For the standing stance Most of the time we only wish to update one overlay: e.g. - we dropped the fireaxe out of our left hand and need to remove its icon from our mob @@ -28,7 +30,7 @@ Note: The defines for layer numbers is now kept exclusvely in __DEFINES/misc.dm All of this means that this code is more maintainable, faster and still fairly easy to use. There are several things that need to be remembered: -> Whenever we do something that should cause an overlay to update (which doesn't use standard procs +> Whenever we do something that should cause an overlay to update (which doesn't use standard procs ( i.e. you do something like l_hand = /obj/item/something new(src), rather than using the helper procs) You will need to call the relevant update_inv_* proc @@ -37,33 +39,38 @@ There are several things that need to be remembered: slime etc. Instead, it'll just return without doing any work. So no harm in calling it for slimes and such. -> There are also these special cases: - update_damage_overlays() //handles damage overlays for brute/burn damage - update_body() //Handles updating your mob's body layer and mutant bodyparts +> There are also these special cases: + update_damage_overlays() //handles damage overlays for brute/burn damage + update_body() //Handles updating your mob's body layer and mutant bodyparts as well as sprite-accessories that didn't really fit elsewhere (underwear, undershirts, socks, lips, eyes) //NOTE: update_mutantrace() is now merged into this! - update_hair() //Handles updating your hair overlay (used to be update_face, but mouth and + update_hair() //Handles updating your hair overlay (used to be update_face, but mouth and eyes were merged into update_body()) */ //HAIR OVERLAY -/mob/living/carbon/human/update_hair() - dna.species.handle_hair(src) +/mob/living/carbon/human/update_hair(is_creating) + var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) + if(!my_head) + return + my_head.update_limb(FALSE, is_creating) + update_body_parts() + //used when putting/removing clothes that hide certain mutant body parts to just update those and not update the whole body. /mob/living/carbon/human/proc/update_mutant_bodyparts() dna.species.handle_mutant_bodyparts(src) - update_body_parts() // basically a better and cooler handle_mutant_bodyparts (at least until handle_mutant_bodyparts is annihilated) + update_body_parts() -/mob/living/carbon/human/update_body() +/mob/living/carbon/human/update_body(is_creating = FALSE) dna.species.handle_body(src) ..() /mob/living/carbon/human/update_fire() - ..((fire_stacks > HUMAN_FIRE_STACK_ICON_NUM) ? dna.species.fire_overlay : "Generic_mob_burning") + ..((fire_stacks > HUMAN_FIRE_STACK_ICON_NUM) ? "Standing" : "Generic_mob_burning") /* --------------------------------------- */ @@ -71,7 +78,6 @@ There are several things that need to be remembered: /mob/living/carbon/human/regenerate_icons() if(!..()) - icon_render_key = null //invalidate bodyparts cache update_body() update_hair() update_inv_w_uniform() @@ -102,15 +108,11 @@ There are several things that need to be remembered: if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ICLOTHING) + 1] - inv.update_appearance() + inv.update_icon() if(istype(w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform - U.screen_loc = ui_iclothing - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) - client.screen += w_uniform - update_observer_view(w_uniform,1) + update_hud_uniform(U) if(wear_suit && (wear_suit.flags_inv & HIDEJUMPSUIT)) return @@ -119,95 +121,114 @@ There are several things that need to be remembered: var/target_overlay = U.icon_state if(U.adjusted == ALT_STYLE) target_overlay = "[target_overlay]_d" - else if(U.adjusted == DIGITIGRADE_STYLE) - target_overlay = "[target_overlay]_l" - var/mutable_appearance/uniform_overlay - if(dna?.species.sexes) - if(body_type == FEMALE && U.female_sprite_flags != NO_FEMALE_UNIFORM) - uniform_overlay = U.build_worn_icon(default_layer = UNIFORM_LAYER, default_icon_file = 'icons/mob/clothing/under/default.dmi', isinhands = FALSE, femaleuniform = U.female_sprite_flags, override_state = target_overlay) - + //Change check_adjustable_clothing.dm if you change this + var/handled_by_bodytype = TRUE + var/icon_file + var/woman if(!uniform_overlay) - uniform_overlay = U.build_worn_icon(default_layer = UNIFORM_LAYER, default_icon_file = 'icons/mob/clothing/under/default.dmi', isinhands = FALSE, override_state = target_overlay) + //BEGIN SPECIES HANDLING + if((dna?.species.bodytype & BODYTYPE_DIGITIGRADE) && (U.supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION)) + icon_file = DIGITIGRADE_UNIFORM_FILE - if(OFFSET_UNIFORM in dna.species.offset_features) - uniform_overlay.pixel_x += dna.species.offset_features[OFFSET_UNIFORM][1] - uniform_overlay.pixel_y += dna.species.offset_features[OFFSET_UNIFORM][2] + //Female sprites have lower priority than digitigrade sprites + else if(dna.species.sexes && (dna.species.bodytype & BODYTYPE_HUMANOID) && physique == FEMALE && U.adjusted != NO_FEMALE_UNIFORM) //Agggggggghhhhh + woman = TRUE + + if(!icon_exists(icon_file, RESOLVE_ICON_STATE(U))) + icon_file = DEFAULT_UNIFORM_FILE + handled_by_bodytype = FALSE + //END SPECIES HANDLING + uniform_overlay = U.build_worn_icon( + default_layer = UNIFORM_LAYER, + default_icon_file = icon_file, + isinhands = FALSE, + femaleuniform = woman ? U.adjusted : null, + override_state = target_overlay, + override_file = handled_by_bodytype ? icon_file : null + ) + + if(OFFSET_UNIFORM in dna.species.offset_features && !handled_by_bodytype) + uniform_overlay?.pixel_x += dna.species.offset_features[OFFSET_UNIFORM][1] + uniform_overlay?.pixel_y += dna.species.offset_features[OFFSET_UNIFORM][2] overlays_standing[UNIFORM_LAYER] = uniform_overlay + apply_overlay(UNIFORM_LAYER) - apply_overlay(UNIFORM_LAYER) update_mutant_bodyparts() - /mob/living/carbon/human/update_inv_wear_id() remove_overlay(ID_LAYER) - remove_overlay(ID_CARD_LAYER) if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ID) + 1] - inv.update_appearance() + inv.update_icon() var/mutable_appearance/id_overlay = overlays_standing[ID_LAYER] if(wear_id) - wear_id.screen_loc = ui_id - if(client && hud_used?.hud_shown) - client.screen += wear_id - update_observer_view(wear_id) + var/obj/item/worn_item = wear_id + update_hud_id(worn_item) + var/handled_by_bodytype + var/icon_file - //TODO: add an icon file for ID slot stuff, so it's less snowflakey - id_overlay = wear_id.build_worn_icon(default_layer = ID_LAYER, default_icon_file = 'icons/mob/clothing/id.dmi') - if(OFFSET_ID in dna.species.offset_features) + if(!icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item))) + icon_file = 'icons/mob/mob.dmi' + handled_by_bodytype = FALSE + + id_overlay = wear_id.build_worn_icon(default_layer = ID_LAYER, default_icon_file = icon_file) + + if(!id_overlay) + return + if(OFFSET_ID in dna.species.offset_features && !handled_by_bodytype) id_overlay.pixel_x += dna.species.offset_features[OFFSET_ID][1] id_overlay.pixel_y += dna.species.offset_features[OFFSET_ID][2] overlays_standing[ID_LAYER] = id_overlay - var/obj/item/card/id/shown_id = wear_id.GetID() - if(shown_id) - var/mutable_appearance/id_card_overlay = overlays_standing[ID_CARD_LAYER] - id_card_overlay = shown_id.build_worn_icon(default_layer = ID_CARD_LAYER, default_icon_file = 'icons/mob/clothing/id_card.dmi') - if(OFFSET_ID in dna.species.offset_features) - id_card_overlay.pixel_x += dna.species.offset_features[OFFSET_ID][1] - id_card_overlay.pixel_y += dna.species.offset_features[OFFSET_ID][2] - - overlays_standing[ID_CARD_LAYER] = id_card_overlay - apply_overlay(ID_LAYER) - apply_overlay(ID_CARD_LAYER) /mob/living/carbon/human/update_inv_gloves() remove_overlay(GLOVES_LAYER) - if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]) + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1] - inv.update_appearance() + inv.update_icon() - if(!gloves && blood_in_hands && (num_hands > 0) && !(NOBLOODOVERLAY in dna.species.species_traits)) - var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER) + //Bloody hands begin + var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER) + cut_overlay(bloody_overlay) + if(!gloves && blood_in_hands && (num_hands > 0)) + bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER) if(num_hands < 2) if(has_left_hand(FALSE)) bloody_overlay.icon_state = "bloodyhands_left" else if(has_right_hand(FALSE)) bloody_overlay.icon_state = "bloodyhands_right" - overlays_standing[GLOVES_LAYER] = bloody_overlay + add_overlay(bloody_overlay) + //Bloody hands end - var/mutable_appearance/gloves_overlay = overlays_standing[GLOVES_LAYER] + var/mutable_appearance/gloves_overlay if(gloves) - gloves.screen_loc = ui_gloves - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) - client.screen += gloves - update_observer_view(gloves,1) - overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(default_layer = GLOVES_LAYER, default_icon_file = 'icons/mob/clothing/hands.dmi') - gloves_overlay = overlays_standing[GLOVES_LAYER] - if(OFFSET_GLOVES in dna.species.offset_features) + var/obj/item/worn_item = gloves + update_hud_gloves(worn_item) + var/icon_file + var/handled_by_bodytype + + if(!icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item))) + icon_file = 'icons/mob/clothing/hands.dmi' + handled_by_bodytype = FALSE + + gloves_overlay = gloves.build_worn_icon(default_layer = GLOVES_LAYER, default_icon_file = icon_file) + + if(!gloves_overlay) + return + if(OFFSET_GLOVES in dna.species.offset_features && !handled_by_bodytype) gloves_overlay.pixel_x += dna.species.offset_features[OFFSET_GLOVES][1] gloves_overlay.pixel_y += dna.species.offset_features[OFFSET_GLOVES][2] - overlays_standing[GLOVES_LAYER] = gloves_overlay + overlays_standing[GLOVES_LAYER] = gloves_overlay apply_overlay(GLOVES_LAYER) @@ -219,24 +240,29 @@ There are several things that need to be remembered: if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EYES) + 1] - inv.update_appearance() + inv.update_icon() if(glasses) - glasses.screen_loc = ui_glasses //...draw the item in the inventory screen - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) //if the inventory is open ... - client.screen += glasses //Either way, add the item to the HUD - update_observer_view(glasses,1) - //This is in case the glasses would be going above the hair, like welding goggles that were lifted up - if(!(head && (head.flags_inv & HIDEEYES)) && !(wear_mask && (wear_mask.flags_inv & HIDEEYES))) - overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(default_layer = GLASSES_LAYER, default_icon_file = 'icons/mob/clothing/eyes.dmi') + var/obj/item/worn_item = glasses + var/mutable_appearance/glasses_overlay + update_hud_glasses(worn_item) - var/mutable_appearance/glasses_overlay = overlays_standing[GLASSES_LAYER] - if(glasses_overlay) - if(OFFSET_GLASSES in dna.species.offset_features) - glasses_overlay.pixel_x += dna.species.offset_features[OFFSET_GLASSES][1] - glasses_overlay.pixel_y += dna.species.offset_features[OFFSET_GLASSES][2] - overlays_standing[GLASSES_LAYER] = glasses_overlay + var/handled_by_bodytype + var/icon_file + if(!(head?.flags_inv & HIDEEYES) && !(wear_mask?.flags_inv & HIDEEYES)) + + if(!icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item))) + icon_file = 'icons/mob/clothing/eyes.dmi' + handled_by_bodytype = FALSE + + glasses_overlay = glasses.build_worn_icon(default_layer = GLASSES_LAYER, default_icon_file = icon_file) + + if(!glasses_overlay) + return + if(OFFSET_GLASSES in dna.species.offset_features && !handled_by_bodytype) + glasses_overlay.pixel_x += dna.species.offset_features[OFFSET_GLASSES][1] + glasses_overlay.pixel_y += dna.species.offset_features[OFFSET_GLASSES][2] + overlays_standing[GLASSES_LAYER] = glasses_overlay apply_overlay(GLASSES_LAYER) @@ -248,22 +274,60 @@ There are several things that need to be remembered: if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EARS) + 1] - inv.update_appearance() + inv.update_icon() if(ears) - ears.screen_loc = ui_ears //move the item to the appropriate screen loc - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) //if the inventory is open - client.screen += ears //add it to the client's screen - update_observer_view(ears,1) - overlays_standing[EARS_LAYER] = ears.build_worn_icon(default_layer = EARS_LAYER, default_icon_file = 'icons/mob/clothing/ears.dmi') - var/mutable_appearance/ears_overlay = overlays_standing[EARS_LAYER] - if(OFFSET_EARS in dna.species.offset_features) + var/obj/item/worn_item = ears + var/mutable_appearance/ears_overlay + update_hud_ears(worn_item) + + var/handled_by_bodytype = TRUE + var/icon_file + + if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item)))) + handled_by_bodytype = FALSE + icon_file = 'icons/mob/clothing/ears.dmi' + + ears_overlay = ears.build_worn_icon(default_layer = EARS_LAYER, default_icon_file = icon_file) + + if(!ears_overlay) + return + if(OFFSET_EARS in dna.species.offset_features && !handled_by_bodytype) ears_overlay.pixel_x += dna.species.offset_features[OFFSET_EARS][1] ears_overlay.pixel_y += dna.species.offset_features[OFFSET_EARS][2] overlays_standing[EARS_LAYER] = ears_overlay apply_overlay(EARS_LAYER) +/mob/living/carbon/human/update_inv_neck() + remove_overlay(NECK_LAYER) + + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1] + inv.update_icon() + + if(wear_neck) + var/obj/item/worn_item = wear_neck + + if(!(ITEM_SLOT_NECK in check_obscured_slots())) + var/mutable_appearance/neck_overlay + var/icon_file + var/handled_by_bodytype = TRUE + + if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item)))) + handled_by_bodytype = FALSE + icon_file = 'icons/mob/clothing/neck.dmi' + + neck_overlay = worn_item.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = icon_file) + + if(!neck_overlay) + return + if(OFFSET_NECK in dna.species.offset_features && !handled_by_bodytype) + neck_overlay.pixel_x += dna.species.offset_features[OFFSET_NECK][1] + neck_overlay.pixel_y += dna.species.offset_features[OFFSET_NECK][2] + overlays_standing[NECK_LAYER] = neck_overlay + update_hud_neck(wear_neck) + + apply_overlay(NECK_LAYER) /mob/living/carbon/human/update_inv_shoes() remove_overlay(SHOES_LAYER) @@ -273,17 +337,30 @@ There are several things that need to be remembered: if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_FEET) + 1] - inv.update_appearance() + inv.update_icon() if(shoes) - shoes.screen_loc = ui_shoes //move the item to the appropriate screen loc - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) //if the inventory is open - client.screen += shoes //add it to client's screen - update_observer_view(shoes,1) - overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/clothing/feet.dmi') - var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER] - if(OFFSET_SHOES in dna.species.offset_features) + var/obj/item/worn_item = shoes + var/mutable_appearance/shoes_overlay + var/icon_file + update_hud_shoes(worn_item) + var/handled_by_bodytype = TRUE + + //(Currently) unused digitigrade handling + /*if((dna.species.bodytype & BODYTYPE_DIGITIGRADE) && (worn_item.supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION)) + var/obj/item/bodypart/leg = src.get_bodypart(BODY_ZONE_L_LEG) + if(leg.limb_id == "digitigrade")//Snowflakey and bad. But it makes it look consistent. + icon_file = DIGITIGRADE_SHOES_FILE*/ + + if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item)))) + handled_by_bodytype = FALSE + icon_file = DEFAULT_SHOES_FILE + + shoes_overlay = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = icon_file) + + if(!shoes_overlay) + return + if(!(handled_by_bodytype) && (OFFSET_SHOES in dna.species.offset_features)) shoes_overlay.pixel_x += dna.species.offset_features[OFFSET_SHOES][1] shoes_overlay.pixel_y += dna.species.offset_features[OFFSET_SHOES][2] overlays_standing[SHOES_LAYER] = shoes_overlay @@ -296,32 +373,50 @@ There are several things that need to be remembered: if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_SUITSTORE) + 1] - inv.update_appearance() + inv.update_icon() if(s_store) - s_store.screen_loc = ui_sstore1 - if(client && hud_used?.hud_shown) - client.screen += s_store - update_observer_view(s_store) - overlays_standing[SUIT_STORE_LAYER] = s_store.build_worn_icon(default_layer = SUIT_STORE_LAYER, default_icon_file = 'icons/mob/clothing/belt_mirror.dmi') - var/mutable_appearance/s_store_overlay = overlays_standing[SUIT_STORE_LAYER] + var/obj/item/worn_item = s_store + var/mutable_appearance/s_store_overlay + update_hud_s_store(worn_item) + + s_store_overlay = worn_item.build_worn_icon(default_layer = SUIT_STORE_LAYER, default_icon_file = 'icons/mob/clothing/belt_mirror.dmi') + + if(!s_store_overlay) + return if(OFFSET_S_STORE in dna.species.offset_features) s_store_overlay.pixel_x += dna.species.offset_features[OFFSET_S_STORE][1] s_store_overlay.pixel_y += dna.species.offset_features[OFFSET_S_STORE][2] overlays_standing[SUIT_STORE_LAYER] = s_store_overlay apply_overlay(SUIT_STORE_LAYER) - /mob/living/carbon/human/update_inv_head() - ..() - update_mutant_bodyparts() - var/mutable_appearance/head_overlay = overlays_standing[HEAD_LAYER] - if(head_overlay) - remove_overlay(HEAD_LAYER) - if(OFFSET_HEAD in dna.species.offset_features) + remove_overlay(HEAD_LAYER) + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1] + inv.update_icon() + + if(head) + var/obj/item/worn_item = head + var/mutable_appearance/head_overlay + update_hud_head(worn_item) + var/handled_by_bodytype = FALSE + var/icon_file + + if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item)))) + handled_by_bodytype = FALSE + icon_file = 'icons/mob/clothing/head.dmi' + + head_overlay = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = icon_file) + + if(!head_overlay) + return + if(!(handled_by_bodytype) && (OFFSET_HEAD in dna.species.offset_features)) head_overlay.pixel_x += dna.species.offset_features[OFFSET_HEAD][1] head_overlay.pixel_y += dna.species.offset_features[OFFSET_HEAD][2] - overlays_standing[HEAD_LAYER] = head_overlay + overlays_standing[HEAD_LAYER] = head_overlay + + update_mutant_bodyparts() apply_overlay(HEAD_LAYER) /mob/living/carbon/human/update_inv_belt() @@ -329,40 +424,59 @@ There are several things that need to be remembered: if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BELT) + 1] - inv.update_appearance() + inv.update_icon() if(belt) - belt.screen_loc = ui_belt - if(client && hud_used?.hud_shown) - client.screen += belt - update_observer_view(belt) - overlays_standing[BELT_LAYER] = belt.build_worn_icon(default_layer = BELT_LAYER, default_icon_file = 'icons/mob/clothing/belt.dmi') - var/mutable_appearance/belt_overlay = overlays_standing[BELT_LAYER] - if(OFFSET_BELT in dna.species.offset_features) + var/obj/item/worn_item = belt + var/mutable_appearance/belt_overlay + update_hud_belt(worn_item) + var/handled_by_bodytype = TRUE + var/icon_file + + if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item)))) + handled_by_bodytype = FALSE + icon_file = 'icons/mob/clothing/belt.dmi' + + belt_overlay = belt.build_worn_icon(default_layer = BELT_LAYER, default_icon_file = icon_file) + + if(!belt_overlay) + return + if(OFFSET_BELT in dna.species.offset_features && !handled_by_bodytype) belt_overlay.pixel_x += dna.species.offset_features[OFFSET_BELT][1] belt_overlay.pixel_y += dna.species.offset_features[OFFSET_BELT][2] overlays_standing[BELT_LAYER] = belt_overlay apply_overlay(BELT_LAYER) - - /mob/living/carbon/human/update_inv_wear_suit() remove_overlay(SUIT_LAYER) if(client && hud_used) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_OCLOTHING) + 1] - inv.update_appearance() + inv.update_icon() - if(istype(wear_suit, /obj/item/clothing/suit)) - wear_suit.screen_loc = ui_oclothing - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) - client.screen += wear_suit - update_observer_view(wear_suit,1) - overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = 'icons/mob/clothing/suit.dmi') - var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER] - if(OFFSET_SUIT in dna.species.offset_features) + if(wear_suit) + var/obj/item/worn_item = wear_suit + var/mutable_appearance/suit_overlay + update_hud_wear_suit(worn_item) + var/icon_file + + var/handled_by_bodytype = TRUE + + //More currently unused digitigrade handling + /*if(dna.species.bodytype & BODYTYPE_DIGITIGRADE) + if(worn_item.supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION) + icon_file = DIGITIGRADE_SUIT_FILE*/ + + if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item)))) + handled_by_bodytype = FALSE + icon_file = DEFAULT_SUIT_FILE + + suit_overlay = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = icon_file) + + if(!suit_overlay) + return + if((!handled_by_bodytype) && (OFFSET_SUIT in dna.species.offset_features)) suit_overlay.pixel_x += dna.species.offset_features[OFFSET_SUIT][1] suit_overlay.pixel_y += dna.species.offset_features[OFFSET_SUIT][2] overlays_standing[SUIT_LAYER] = suit_overlay @@ -377,10 +491,9 @@ There are several things that need to be remembered: var/atom/movable/screen/inventory/inv inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_LPOCKET) + 1] - inv.update_appearance() - inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_RPOCKET) + 1] - inv.update_appearance() + + inv.update_icon() if(l_store) l_store.screen_loc = ui_storage1 @@ -394,46 +507,120 @@ There are several things that need to be remembered: client.screen += r_store update_observer_view(r_store) - /mob/living/carbon/human/update_inv_wear_mask() - ..() - var/mutable_appearance/mask_overlay = overlays_standing[FACEMASK_LAYER] - if(mask_overlay) - remove_overlay(FACEMASK_LAYER) - if(OFFSET_FACEMASK in dna.species.offset_features) + remove_overlay(FACEMASK_LAYER) + + if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated + return + + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1] + inv.update_icon() + + if(wear_mask) + var/obj/item/worn_item = wear_mask + update_hud_wear_mask(worn_item) + var/mutable_appearance/mask_overlay + var/icon_file = 'icons/mob/clothing/mask.dmi' + var/handled_by_bodytype = TRUE + + if(!(ITEM_SLOT_MASK in check_obscured_slots())) + + if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item)))) + icon_file = 'icons/mob/clothing/mask.dmi' + handled_by_bodytype = FALSE + + mask_overlay = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = icon_file) + + if(!mask_overlay) + return + if((!handled_by_bodytype) && (OFFSET_FACEMASK in dna.species.offset_features)) mask_overlay.pixel_x += dna.species.offset_features[OFFSET_FACEMASK][1] mask_overlay.pixel_y += dna.species.offset_features[OFFSET_FACEMASK][2] - overlays_standing[FACEMASK_LAYER] = mask_overlay - apply_overlay(FACEMASK_LAYER) + + overlays_standing[FACEMASK_LAYER] = mask_overlay + + apply_overlay(FACEMASK_LAYER) update_mutant_bodyparts() //e.g. upgate needed because mask now hides lizard snout /mob/living/carbon/human/update_inv_back() - ..() - var/mutable_appearance/back_overlay = overlays_standing[BACK_LAYER] - if(back_overlay) - remove_overlay(BACK_LAYER) - if(OFFSET_BACK in dna.species.offset_features) + remove_overlay(BACK_LAYER) + + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1] + inv.update_icon() + + if(back) + var/obj/item/worn_item = back + var/mutable_appearance/back_overlay + update_hud_back(worn_item) + var/icon_file = 'icons/mob/clothing/back.dmi' + var/handled_by_bodytype = TRUE + + if(!icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item))) + icon_file = 'icons/mob/clothing/back.dmi' + handled_by_bodytype = FALSE + + back_overlay = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = icon_file) + + if(!back_overlay) + return + if((!handled_by_bodytype) && (OFFSET_BACK in dna.species.offset_features)) back_overlay.pixel_x += dna.species.offset_features[OFFSET_BACK][1] back_overlay.pixel_y += dna.species.offset_features[OFFSET_BACK][2] - overlays_standing[BACK_LAYER] = back_overlay - apply_overlay(BACK_LAYER) + overlays_standing[BACK_LAYER] = back_overlay + apply_overlay(BACK_LAYER) /mob/living/carbon/human/update_inv_legcuffed() remove_overlay(LEGCUFF_LAYER) - clear_alert(ALERT_LEGCUFFED) + clear_alert("legcuffed") if(legcuffed) - var/mutable_appearance/legcuff_overlay = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER) - if(legcuffed.blocks_emissive) - legcuff_overlay.overlays += emissive_blocker(legcuff_overlay.icon, legcuff_overlay.icon_state, alpha = legcuff_overlay.alpha) - - overlays_standing[LEGCUFF_LAYER] = legcuff_overlay + overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER) apply_overlay(LEGCUFF_LAYER) - throw_alert(ALERT_LEGCUFFED, /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed) + throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed) + +/mob/living/carbon/human/update_inv_hands() + remove_overlay(HANDS_LAYER) + if (handcuffed) + drop_all_held_items() + return + + var/list/hands = list() + for(var/obj/item/worn_item in held_items) + if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) + worn_item.screen_loc = ui_hand_position(get_held_index_of_item(worn_item)) + client.screen += worn_item + if(observers?.len) + for(var/M in observers) + var/mob/dead/observe = M + if(observe.client && observe.client.eye == src) + observe.client.screen += worn_item + else + observers -= observe + if(!observers.len) + observers = null + break + + var/t_state = worn_item.inhand_icon_state + if(!t_state) + t_state = worn_item.icon_state + + var/icon_file = worn_item.lefthand_file + var/mutable_appearance/hand_overlay + if(get_held_index_of_item(worn_item) % 2 == 0) + icon_file = worn_item.righthand_file + hand_overlay = worn_item.build_worn_icon(default_layer = HANDS_LAYER, default_icon_file = icon_file, isinhands = TRUE) + else + hand_overlay = worn_item.build_worn_icon(default_layer = HANDS_LAYER, default_icon_file = icon_file, isinhands = TRUE) + + hands += hand_overlay + overlays_standing[HANDS_LAYER] = hands + apply_overlay(HANDS_LAYER) /proc/wear_female_version(t_color, icon, layer, type, greyscale_colors) var/index = "[t_color]-[greyscale_colors]" var/icon/female_clothing_icon = GLOB.female_clothing_icons[index] - if(!female_clothing_icon) //Create standing/laying icons if they don't exist + if(!female_clothing_icon) //Create standing/laying icons if they don't exist generate_female_clothing(index, t_color, icon, type) return mutable_appearance(GLOB.female_clothing_icons[index], layer = -layer) @@ -449,36 +636,86 @@ There are several things that need to be remembered: //human HUD updates for items in our inventory -//update whether our head item appears on our hud. -/mob/living/carbon/human/update_hud_head(obj/item/I) - I.screen_loc = ui_head +/mob/living/carbon/human/proc/update_hud_uniform(obj/item/worn_item) + worn_item.screen_loc = ui_iclothing + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/proc/update_hud_id(obj/item/worn_item) + worn_item.screen_loc = ui_id + if((client && hud_used?.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item) + +/mob/living/carbon/human/proc/update_hud_gloves(obj/item/worn_item) + worn_item.screen_loc = ui_gloves + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/proc/update_hud_glasses(obj/item/worn_item) + worn_item.screen_loc = ui_glasses + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/proc/update_hud_ears(obj/item/worn_item) + worn_item.screen_loc = ui_ears + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/proc/update_hud_shoes(obj/item/worn_item) + worn_item.screen_loc = ui_shoes + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/proc/update_hud_s_store(obj/item/worn_item) + worn_item.screen_loc = ui_sstore1 + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/proc/update_hud_wear_suit(obj/item/worn_item) + worn_item.screen_loc = ui_oclothing + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/proc/update_hud_belt(obj/item/worn_item) + belt.screen_loc = ui_belt if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) - client.screen += I - update_observer_view(I,1) + client.screen += worn_item + update_observer_view(worn_item,TRUE) + +/mob/living/carbon/human/update_hud_head(obj/item/worn_item) + worn_item.screen_loc = ui_head + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) //update whether our mask item appears on our hud. -/mob/living/carbon/human/update_hud_wear_mask(obj/item/I) - I.screen_loc = ui_mask - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) - client.screen += I - update_observer_view(I,1) +/mob/living/carbon/human/update_hud_wear_mask(obj/item/worn_item) + worn_item.screen_loc = ui_mask + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) //update whether our neck item appears on our hud. -/mob/living/carbon/human/update_hud_neck(obj/item/I) - I.screen_loc = ui_neck - if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) - client.screen += I - update_observer_view(I,1) +/mob/living/carbon/human/update_hud_neck(obj/item/worn_item) + worn_item.screen_loc = ui_neck + if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item,TRUE) //update whether our back item appears on our hud. -/mob/living/carbon/human/update_hud_back(obj/item/I) - I.screen_loc = ui_back +/mob/living/carbon/human/update_hud_back(obj/item/worn_item) + worn_item.screen_loc = ui_back if(client && hud_used?.hud_shown) - client.screen += I - update_observer_view(I) + client.screen += worn_item + update_observer_view(worn_item, inventory = TRUE) /* Does everything in relation to building the /mutable_appearance used in the mob's overlays list @@ -505,7 +742,7 @@ generate/load female uniform sprites matching all previously decided variables */ -/obj/item/proc/build_worn_icon(default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, override_state = null) +/obj/item/proc/build_worn_icon(default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, override_state = null, override_file = null) //Find a valid icon_state from variables+arguments var/t_state @@ -515,8 +752,11 @@ generate/load female uniform sprites matching all previously decided variables t_state = !isinhands ? (worn_icon_state ? worn_icon_state : icon_state) : (inhand_icon_state ? inhand_icon_state : icon_state) //Find a valid icon file from variables+arguments - var/file2use = !isinhands ? (worn_icon ? worn_icon : default_icon_file) : default_icon_file - + var/file2use + if(override_file) + file2use = override_file + else + file2use = !isinhands ? (worn_icon ? worn_icon : default_icon_file) : default_icon_file //Find a valid layer from variables+arguments var/layer2use = alternate_worn_layer ? alternate_worn_layer : default_layer @@ -568,56 +808,7 @@ generate/load female uniform sprites matching all previously decided variables else //No offsets or Unwritten number of hands return list("x" = 0, "y" = 0)//Handle held offsets -//produces a key based on the human's limbs -/mob/living/carbon/human/generate_icon_render_key() - . = "[dna.species.limbs_id]" - - if(dna.check_mutation(/datum/mutation/human/hulk)) - . += "-coloured-hulk" - else if(dna.species.use_skintones) - . += "-coloured-[skin_tone]" - else if(dna.species.fixed_mut_color) - . += "-coloured-[dna.species.fixed_mut_color]" - else if(dna.features["mcolor"]) - . += "-coloured-[dna.features["mcolor"]]" - else - . += "-not_coloured" - - . += "-[body_type]" - - for(var/X in bodyparts) - var/obj/item/bodypart/BP = X - . += "-[BP.body_zone]" - - if(!HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) - for(var/obj/item/organ/external/organ as anything in BP.external_organs) - if(organ.can_draw_on_bodypart(src)) //make sure we're drawn before generating a key - . += "([organ.cache_key])" - - if(BP.status == BODYPART_ORGANIC) - . += "-organic" - else - . += "-robotic" - if(BP.use_digitigrade) - . += "-digitigrade[BP.use_digitigrade]" - if(BP.dmg_overlay_type) - . += "-[BP.dmg_overlay_type]" - if(HAS_TRAIT(BP, TRAIT_PLASMABURNT)) - . += "-plasmaburnt" - - if(HAS_TRAIT(src, TRAIT_HUSK)) - . += "-husk" - - if(HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) - . += "-invisible" - -/mob/living/carbon/human/load_limb_from_cache() - ..() - update_hair() - - - -/mob/living/carbon/human/proc/update_observer_view(obj/item/I, inventory) +/mob/living/carbon/human/proc/update_observer_view(obj/item/worn_item, inventory) if(observers?.len) for(var/M in observers) var/mob/dead/observe = M @@ -625,7 +816,7 @@ generate/load female uniform sprites matching all previously decided variables if(observe.hud_used) if(inventory && !observe.hud_used.inventory_shown) continue - observe.client.screen += I + observe.client.screen += worn_item else observers -= observe if(!observers.len) @@ -633,11 +824,8 @@ generate/load female uniform sprites matching all previously decided variables break // Only renders the head of the human -/mob/living/carbon/human/proc/update_body_parts_head_only() - if (!dna) - return - - if (!dna.species) +/mob/living/carbon/human/proc/update_body_parts_head_only(update_limb_data) + if(!dna?.species) return var/obj/item/bodypart/HD = get_bodypart("head") @@ -645,7 +833,7 @@ generate/load female uniform sprites matching all previously decided variables if (!istype(HD)) return - HD.update_limb() + HD.update_limb(is_creating = update_limb_data) add_overlay(HD.get_limb_icon()) update_damage_overlays() @@ -669,13 +857,14 @@ generate/load female uniform sprites matching all previously decided variables else eye_overlay = mutable_appearance('icons/mob/human_face.dmi', E.eye_icon_state, -BODY_LAYER) if((EYECOLOR in dna.species.species_traits) && E) - eye_overlay.color = eye_color + eye_overlay.color = "#" + eye_color if(OFFSET_FACE in dna.species.offset_features) eye_overlay.pixel_x += dna.species.offset_features[OFFSET_FACE][1] eye_overlay.pixel_y += dna.species.offset_features[OFFSET_FACE][2] add_overlay(eye_overlay) - dna.species.handle_hair(src) update_inv_head() update_inv_wear_mask() + +#undef RESOLVE_ICON_STATE diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index be66c441eed..36765de0ba2 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -40,7 +40,7 @@ return s_store return null -/mob/living/carbon/human/proc/get_all_slots() +/mob/living/carbon/human/get_all_worn_items() . = get_head_slots() | get_body_slots() /mob/living/carbon/human/proc/get_body_slots() @@ -170,7 +170,7 @@ /mob/living/carbon/human/equipped_speed_mods() . = ..() - for(var/sloties in get_all_slots() - list(l_store, r_store, s_store)) + for(var/sloties in get_all_worn_items() - list(l_store, r_store, s_store)) var/obj/item/thing = sloties . += thing?.slowdown @@ -298,7 +298,7 @@ //delete all equipment without dropping anything /mob/living/carbon/human/proc/delete_equipment() - for(var/slot in get_all_slots())//order matters, dependant slots go first + for(var/slot in get_all_worn_items())//order matters, dependant slots go first qdel(slot) for(var/obj/item/I in held_items) qdel(I) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 45d6d85305f..c3f9e1de95c 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -15,8 +15,6 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species ///If the game needs to manually check your race to do something not included in a proc here, it will use this. var/id - //This is used if you want to use a different species' limb sprites. - var/limbs_id ///This is the fluff name. They are displayed on health analyzers and in the character setup menu. Leave them generic for other servers to customize. var/name /// The formatting of the name of the species in plural context. Defaults to "[name]\s" if unset. @@ -27,15 +25,22 @@ GLOBAL_LIST_EMPTY(features_by_species) ///Whether or not the race has sexual characteristics (biological genders). At the moment this is only FALSE for skeletons and shadows var/sexes = TRUE - + ///A bitfield of "bodytypes", updated by /datum/obj/item/bodypart/proc/synchronize_bodytypes() + var/bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC ///Clothing offsets. If a species has a different body than other species, you can offset clothing so they look less weird. var/list/offset_features = list(OFFSET_UNIFORM = list(0,0), OFFSET_ID = list(0,0), OFFSET_GLOVES = list(0,0), OFFSET_GLASSES = list(0,0), OFFSET_EARS = list(0,0), OFFSET_SHOES = list(0,0), OFFSET_S_STORE = list(0,0), OFFSET_FACEMASK = list(0,0), OFFSET_HEAD = list(0,0), OFFSET_FACE = list(0,0), OFFSET_BELT = list(0,0), OFFSET_BACK = list(0,0), OFFSET_SUIT = list(0,0), OFFSET_NECK = list(0,0)) + ///The maximum number of bodyparts this species can have. + var/max_bodypart_count = 6 ///This allows races to have specific hair colors. If null, it uses the H's hair/facial hair colors. If "mutcolor", it uses the H's mutant_color. If "fixedmutcolor", it uses fixedmutcolor var/hair_color ///The alpha used by the hair. 255 is completely solid, 0 is invisible. var/hair_alpha = 255 + ///This is used for children, it will determine their default limb ID for use of examine. See [/mob/living/carbon/human/proc/examine]. + var/examine_limb_id + ///Never, Optional, or Forced digi legs? + var/digitigrade_customization = DIGITIGRADE_NEVER ///Does the species use skintones or not? As of now only used by humans. var/use_skintones = FALSE ///If your race bleeds something other than bog standard blood, change this to reagent id. For example, ethereals bleed liquid electricity. @@ -73,13 +78,14 @@ GLOBAL_LIST_EMPTY(features_by_species) ///Internal organs that are unique to this race, like a tail. var/list/mutant_organs = list() ///The bodyparts this species uses. assoc of bodypart string - bodypart type. Make sure all the fucking entries are in or I'll skin you alive. - var/list/bodypart_overides = list( - BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm,\ - BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm,\ - BODY_ZONE_HEAD = /obj/item/bodypart/head,\ - BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg,\ - BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg,\ - BODY_ZONE_CHEST = /obj/item/bodypart/chest) + var/list/bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm, + BODY_ZONE_HEAD = /obj/item/bodypart/head, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg, + BODY_ZONE_CHEST = /obj/item/bodypart/chest, + ) ///List of external organs to generate like horns, frills, wings, etc. list(typepath of organ = "Round Beautiful BDSM Snout"). Still WIP var/list/external_organs = list() @@ -232,8 +238,6 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/New() - if(!limbs_id) //if we havent set a limbs id to use, just use our own id - limbs_id = id wings_icons = string_list(wings_icons) if(!plural_form) @@ -415,16 +419,10 @@ GLOBAL_LIST_EMPTY(features_by_species) if(C.hud_used) C.hud_used.update_locked_slots() - fix_non_native_limbs(C) - - // this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits - if(C.dna.species.mutant_bodyparts["legs"] && C.dna.features["legs"] == "Digitigrade Legs") - species_traits += DIGITIGRADE - if(DIGITIGRADE in species_traits) - C.Digitigrade_Leg_Swap(FALSE) C.mob_biotypes = inherent_biotypes + replace_body(C, src) regenerate_organs(C, old_species, visual_only = C.visual_only_organs) if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype) @@ -497,8 +495,6 @@ GLOBAL_LIST_EMPTY(features_by_species) SHOULD_CALL_PARENT(TRUE) if(C.dna.species.exotic_bloodtype) C.dna.blood_type = random_blood_type() - if(DIGITIGRADE in species_traits) - C.Digitigrade_Leg_Swap(TRUE) for(var/X in inherent_traits) REMOVE_TRAIT(C, X, SPECIES_TRAIT) for(var/obj/item/organ/external/organ in C.internal_organs) @@ -526,151 +522,6 @@ GLOBAL_LIST_EMPTY(features_by_species) SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src) -/** - * Handles hair icons and dynamic hair. - * - * Handles hiding hair with clothing, hair layers, losing hair due to husking or augmented heads, facial hair, head hair, and hair styles. - * Arguments: - * * H - Human, whoever we're handling the hair for - * * forced_colour - The colour of hair we're forcing on this human. Leave null to not change. Mind the british spelling! - */ -/datum/species/proc/handle_hair(mob/living/carbon/human/H, forced_colour) - H.remove_overlay(HAIR_LAYER) - var/obj/item/bodypart/head/noggin = H.get_bodypart(BODY_ZONE_HEAD) - if(!noggin) //Decapitated - return - - if(HAS_TRAIT(H, TRAIT_HUSK) || HAS_TRAIT(H, TRAIT_INVISIBLE_MAN)) - return - var/datum/sprite_accessory/S - var/list/standing = list() - - var/hair_hidden = FALSE //ignored if the matching dynamic_X_suffix is non-empty - var/facialhair_hidden = FALSE // ^ - - //for augmented heads - if(noggin.status == BODYPART_ROBOTIC) - return - - //we check if our hat or helmet hides our facial hair. - if(H.head) - var/obj/item/I = H.head - if(I.flags_inv & HIDEFACIALHAIR) - facialhair_hidden = TRUE - - if(H.wear_mask) - var/obj/item/I = H.wear_mask - if(I.flags_inv & HIDEFACIALHAIR) - facialhair_hidden = TRUE - - if(H.facial_hairstyle && (FACEHAIR in species_traits) && !facialhair_hidden) - S = GLOB.facial_hairstyles_list[H.facial_hairstyle] - if(S) - - var/mutable_appearance/facial_overlay = mutable_appearance(S.icon, S.icon_state, -HAIR_LAYER) - var/mutable_appearance/gradient_overlay - - if(!forced_colour) - if(hair_color) - if(hair_color == "mutcolor") - facial_overlay.color = H.dna.features["mcolor"] - else if(hair_color == "fixedmutcolor") - facial_overlay.color = fixed_mut_color - else - facial_overlay.color = hair_color - else - facial_overlay.color = H.facial_hair_color - //Gradients - var/grad_style = LAZYACCESS(H.grad_style, GRADIENT_FACIAL_HAIR_KEY) - if(grad_style) - var/grad_color = LAZYACCESS(H.grad_color, GRADIENT_FACIAL_HAIR_KEY) - gradient_overlay = make_gradient_overlay(S.icon, S.icon_state, HAIR_LAYER, GLOB.facial_hair_gradients_list[grad_style], grad_color) - else - facial_overlay.color = forced_colour - - facial_overlay.alpha = hair_alpha - facial_overlay.overlays += emissive_blocker(S.icon, S.icon_state, alpha = hair_alpha) - - standing += facial_overlay - if(gradient_overlay) - standing += gradient_overlay - - if(H.head) - var/obj/item/I = H.head - if(I.flags_inv & HIDEHAIR) - hair_hidden = TRUE - - if(H.w_uniform) - var/obj/item/item_uniform = H.w_uniform - if(item_uniform.flags_inv & HIDEHAIR) - hair_hidden = TRUE - - if(H.wear_mask) - var/obj/item/I = H.wear_mask - if(I.flags_inv & HIDEHAIR) - hair_hidden = TRUE - - if(!hair_hidden) - var/mutable_appearance/hair_overlay = mutable_appearance(layer = -HAIR_LAYER) - var/mutable_appearance/gradient_overlay - if(!hair_hidden && !H.getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain - if(!(NOBLOOD in species_traits)) - hair_overlay.icon = 'icons/mob/human_face.dmi' - hair_overlay.icon_state = "debrained" - - else if(H.hairstyle && (HAIR in species_traits)) - S = GLOB.hairstyles_list[H.hairstyle] - if(S) - var/hair_state = S.icon_state - var/hair_file = S.icon - - hair_overlay.icon = hair_file - hair_overlay.icon_state = hair_state - - if(!forced_colour) - if(hair_color) - if(hair_color == "mutcolor") - hair_overlay.color = H.dna.features["mcolor"] - else if(hair_color == "fixedmutcolor") - hair_overlay.color = fixed_mut_color - else - hair_overlay.color = hair_color - else - hair_overlay.color = H.hair_color - - //Gradients - var/grad_style = LAZYACCESS(H.grad_style, GRADIENT_HAIR_KEY) - if(grad_style) - var/grad_color = LAZYACCESS(H.grad_color, GRADIENT_HAIR_KEY) - gradient_overlay = make_gradient_overlay(hair_file, hair_state, HAIR_LAYER, GLOB.hair_gradients_list[grad_style], grad_color) - else - hair_overlay.color = forced_colour - - hair_overlay.alpha = hair_alpha - if(OFFSET_FACE in H.dna.species.offset_features) - hair_overlay.pixel_x += H.dna.species.offset_features[OFFSET_FACE][1] - hair_overlay.pixel_y += H.dna.species.offset_features[OFFSET_FACE][2] - - if(hair_overlay.icon) - hair_overlay.overlays += emissive_blocker(hair_overlay.icon, hair_overlay.icon_state, alpha = hair_alpha) - standing += hair_overlay - if(gradient_overlay) - standing += gradient_overlay - - if(standing.len) - H.overlays_standing[HAIR_LAYER] = standing - - H.apply_overlay(HAIR_LAYER) - -/datum/species/proc/make_gradient_overlay(file, icon, layer, datum/sprite_accessory/gradient, grad_color) - var/mutable_appearance/gradient_overlay = mutable_appearance(layer = -layer) - var/icon/temp = icon(gradient.icon, gradient.icon_state) - var/icon/temp_hair = icon(file, icon) - temp.Blend(temp_hair, ICON_ADD) - gradient_overlay.icon = temp - gradient_overlay.color = grad_color - return gradient_overlay - /** * Handles the body of a human * @@ -737,27 +588,27 @@ GLOBAL_LIST_EMPTY(features_by_species) var/datum/sprite_accessory/markings = GLOB.moth_markings_list[species_human.dna.features["moth_markings"]] if(!HAS_TRAIT(species_human, TRAIT_HUSK)) - if(noggin && (noggin.status != BODYPART_ROBOTIC)) + if(noggin && (IS_ORGANIC_LIMB(noggin))) var/mutable_appearance/markings_head_overlay = mutable_appearance(markings.icon, "[markings.icon_state]_head", -BODY_LAYER) standing += markings_head_overlay - if(chest && (chest.status != BODYPART_ROBOTIC)) + if(chest && (IS_ORGANIC_LIMB(chest))) var/mutable_appearance/markings_chest_overlay = mutable_appearance(markings.icon, "[markings.icon_state]_chest", -BODY_LAYER) standing += markings_chest_overlay - if(right_arm && (right_arm.status != BODYPART_ROBOTIC)) + if(right_arm && (IS_ORGANIC_LIMB(right_arm))) var/mutable_appearance/markings_r_arm_overlay = mutable_appearance(markings.icon, "[markings.icon_state]_r_arm", -BODY_LAYER) standing += markings_r_arm_overlay - if(left_arm && (left_arm.status != BODYPART_ROBOTIC)) + if(left_arm && (IS_ORGANIC_LIMB(left_arm))) var/mutable_appearance/markings_l_arm_overlay = mutable_appearance(markings.icon, "[markings.icon_state]_l_arm", -BODY_LAYER) standing += markings_l_arm_overlay - if(right_leg && (right_leg.status != BODYPART_ROBOTIC)) + if(right_leg && (IS_ORGANIC_LIMB(right_leg))) var/mutable_appearance/markings_r_leg_overlay = mutable_appearance(markings.icon, "[markings.icon_state]_r_leg", -BODY_LAYER) standing += markings_r_leg_overlay - if(left_leg && (left_leg.status != BODYPART_ROBOTIC)) + if(left_leg && (IS_ORGANIC_LIMB(left_leg))) var/mutable_appearance/markings_l_leg_overlay = mutable_appearance(markings.icon, "[markings.icon_state]_l_leg", -BODY_LAYER) standing += markings_l_leg_overlay @@ -767,7 +618,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/datum/sprite_accessory/underwear/underwear = GLOB.underwear_list[species_human.underwear] var/mutable_appearance/underwear_overlay if(underwear) - if(species_human.dna.species.sexes && species_human.body_type == FEMALE && (underwear.gender == MALE)) + if(species_human.dna.species.sexes && species_human.physique == FEMALE && (underwear.gender == MALE)) underwear_overlay = wear_female_version(underwear.icon_state, underwear.icon, BODY_LAYER, FEMALE_UNIFORM_FULL) else underwear_overlay = mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER) @@ -778,12 +629,12 @@ GLOBAL_LIST_EMPTY(features_by_species) if(species_human.undershirt) var/datum/sprite_accessory/undershirt/undershirt = GLOB.undershirt_list[species_human.undershirt] if(undershirt) - if(species_human.dna.species.sexes && species_human.body_type == FEMALE) + if(species_human.dna.species.sexes && species_human.physique == FEMALE) standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER) else standing += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER) - if(species_human.socks && species_human.num_legs >= 2 && !(DIGITIGRADE in species_traits)) + if(species_human.socks && species_human.num_legs >= 2 && !(src.bodytype & BODYTYPE_DIGITIGRADE)) var/datum/sprite_accessory/socks/socks = GLOB.socks_list[species_human.socks] if(socks) standing += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER) @@ -852,36 +703,13 @@ GLOBAL_LIST_EMPTY(features_by_species) bodyparts_to_add -= "waggingspines" if(mutant_bodyparts["ears"]) - if(!source.dna.features["ears"] || source.dna.features["ears"] == "None" || source.head && (source.head.flags_inv & HIDEHAIR) || (source.wear_mask && (source.wear_mask.flags_inv & HIDEHAIR)) || !noggin || noggin.status == BODYPART_ROBOTIC) + if(!source.dna.features["ears"] || source.dna.features["ears"] == "None" || source.head && (source.head.flags_inv & HIDEHAIR) || (source.wear_mask && (source.wear_mask.flags_inv & HIDEHAIR)) || !noggin || !IS_ORGANIC_LIMB(noggin)) bodyparts_to_add -= "ears" - //Digitigrade legs are stuck in the phantom zone between true limbs and mutant bodyparts. Mainly it just needs more aggressive updating than most limbs. - var/update_needed = FALSE - var/not_digitigrade = TRUE - for(var/obj/item/bodypart/bodypart as anything in source.bodyparts) - if(!bodypart.use_digitigrade) - continue - not_digitigrade = FALSE - if(!(DIGITIGRADE in species_traits)) //Someone cut off a digitigrade leg and tacked it on - species_traits += DIGITIGRADE - var/should_be_squished = FALSE - if(source.wear_suit && ((source.wear_suit.flags_inv & HIDEJUMPSUIT) || (source.wear_suit.body_parts_covered & LEGS)) || (source.w_uniform && (source.w_uniform.body_parts_covered & LEGS))) - should_be_squished = TRUE - if(bodypart.use_digitigrade == FULL_DIGITIGRADE && should_be_squished) - bodypart.use_digitigrade = SQUISHED_DIGITIGRADE - update_needed = TRUE - else if(bodypart.use_digitigrade == SQUISHED_DIGITIGRADE && !should_be_squished) - bodypart.use_digitigrade = FULL_DIGITIGRADE - update_needed = TRUE - if(update_needed) - source.update_body_parts() - if(not_digitigrade && (DIGITIGRADE in species_traits)) //Curse is lifted - species_traits -= DIGITIGRADE - if(!bodyparts_to_add) return - var/g = (source.body_type == FEMALE) ? "f" : "m" + var/g = (source.physique == FEMALE) ? "f" : "m" for(var/layer in relevent_layers) var/layertext = mutant_bodyparts_layertext(layer) @@ -1054,15 +882,16 @@ GLOBAL_LIST_EMPTY(features_by_species) if(ITEM_SLOT_FEET) if(H.num_legs < 2) return FALSE - if((DIGITIGRADE in species_traits) && !(I.item_flags & IGNORE_DIGITIGRADE)) - if(!disable_warning) - to_chat(H, span_warning("The footwear around here isn't compatible with your feet!")) - return FALSE + if((bodytype & BODYTYPE_DIGITIGRADE) && !(I.item_flags & IGNORE_DIGITIGRADE)) + if(!(I.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) + if(!disable_warning) + to_chat(H, span_warning("The footwear around here isn't compatible with your feet!")) + return FALSE return equip_delay_self_check(I, H, bypass_equip_delay_self) if(ITEM_SLOT_BELT) var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_CHEST) - if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) + if(!H.w_uniform && !nojumpsuit && (!O || IS_ORGANIC_LIMB(O))) if(!disable_warning) to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE @@ -1086,7 +915,7 @@ GLOBAL_LIST_EMPTY(features_by_species) return equip_delay_self_check(I, H, bypass_equip_delay_self) if(ITEM_SLOT_ID) var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_CHEST) - if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) + if(!H.w_uniform && !nojumpsuit && (!O || IS_ORGANIC_LIMB(O))) if(!disable_warning) to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE @@ -1099,7 +928,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_L_LEG) - if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) + if(!H.w_uniform && !nojumpsuit && (!O || IS_ORGANIC_LIMB(O))) if(!disable_warning) to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE @@ -1112,7 +941,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_R_LEG) - if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) + if(!H.w_uniform && !nojumpsuit && (!O || IS_ORGANIC_LIMB(O))) if(!disable_warning) to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE @@ -1431,7 +1260,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/bloody = FALSE if(((I.damtype == BRUTE) && I.force && prob(25 + (I.force * 2)))) - if(affecting.status == BODYPART_ORGANIC) + if(IS_ORGANIC_LIMB(affecting)) I.add_mob_blood(H) //Make the weapon bloody, not the person. if(prob(I.force * 2)) //blood spatter! bloody = TRUE @@ -2050,7 +1879,7 @@ GLOBAL_LIST_EMPTY(features_by_species) else wings_icon = wings_icons[1] - var/obj/item/organ/external/wings/functional/wings = new(null, wings_icon, H.body_type) + var/obj/item/organ/external/wings/functional/wings = new(null, wings_icon, H.physique) wings.Insert(H) handle_mutant_bodyparts(H) @@ -2068,18 +1897,6 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/spec_unarmedattack(mob/living/carbon/human/user, atom/target, modifiers) return FALSE - -///Removes any non-native limbs from the mob -/datum/species/proc/fix_non_native_limbs(mob/living/carbon/human/H) - for(var/X in H.bodyparts) - var/obj/item/bodypart/current_part = X - var/obj/item/bodypart/species_part = bodypart_overides[current_part.body_zone] - - if(current_part.type == species_part) - continue - - current_part.change_bodypart(species_part) - /// Returns a list of strings representing features this species has. /// Used by the preferences UI to know what buttons to show. /datum/species/proc/get_features() @@ -2514,3 +2331,24 @@ GLOBAL_LIST_EMPTY(features_by_species) qdel(temp_holder) return to_add + +///Handles replacing all of the bodyparts with their species version during set_species() +/datum/species/proc/replace_body(mob/living/carbon/target, datum/species/new_species) + new_species ||= target.dna.species //If no new species is provided, assume its src. + //Note for future: Potentionally add a new C.dna.species() to build a template species for more accurate limb replacement + + if((new_species.digitigrade_customization == DIGITIGRADE_OPTIONAL && target.dna.features["legs"] == "Digitigrade Legs") || new_species.digitigrade_customization == DIGITIGRADE_FORCED) + new_species.bodypart_overrides[BODY_ZONE_R_LEG] = /obj/item/bodypart/r_leg/digitigrade + new_species.bodypart_overrides[BODY_ZONE_L_LEG] = /obj/item/bodypart/l_leg/digitigrade + + for(var/obj/item/bodypart/old_part as anything in target.bodyparts) + if(old_part.change_exempt_flags & BP_BLOCK_CHANGE_SPECIES) + continue + + var/path = new_species.bodypart_overrides?[old_part.body_zone] + var/obj/item/bodypart/new_part + if(path) + new_part = new path() + new_part.replace_limb(target, TRUE) + new_part.update_limb(is_creating = TRUE) + qdel(old_part) diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm index aa148fc3e07..a248ce1e338 100644 --- a/code/modules/mob/living/carbon/human/species_types/abductors.dm +++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm @@ -16,6 +16,15 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT ass_image = 'icons/ass/assgrey.png' + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/abductor, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/abductor, + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/abductor, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/abductor, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/abductor, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/abductor, + ) + /datum/species/abductor/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() var/datum/atom_hud/abductor_hud = GLOB.huds[DATA_HUD_ABDUCTOR] diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm index 9398d1c09c4..e882a4fa514 100644 --- a/code/modules/mob/living/carbon/human/species_types/android.dm +++ b/code/modules/mob/living/carbon/human/species_types/android.dm @@ -27,25 +27,38 @@ damage_overlay_type = "synth" mutanttongue = /obj/item/organ/tongue/robot species_language_holder = /datum/language_holder/synthetic - limbs_id = "synth" wings_icons = list("Robotic") changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/robot, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/robot, + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/robot, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/robot, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/robot, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/robot, + ) + examine_limb_id = SPECIES_HUMAN + /datum/species/android/on_species_gain(mob/living/carbon/C) . = ..() - for(var/X in C.bodyparts) - var/obj/item/bodypart/O = X - O.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) - O.brute_reduction = 5 - O.burn_reduction = 4 - // Androids don't eat, hunger or metabolise foods. Let's do some cleanup. C.set_safe_hunger_level() -/datum/species/android/on_species_loss(mob/living/carbon/C) +/datum/species/human/android/replace_body(mob/living/carbon/target, datum/species/new_species) . = ..() - for(var/X in C.bodyparts) - var/obj/item/bodypart/O = X - O.change_bodypart_status(BODYPART_ORGANIC,FALSE, TRUE) - O.brute_reduction = initial(O.brute_reduction) - O.burn_reduction = initial(O.burn_reduction) + var/skintone + if(ishuman(target)) + var/mob/living/carbon/human/human_target = target + skintone = human_target.skin_tone + + for(var/obj/item/bodypart/limb as anything in target.bodyparts) + if(limb.body_zone == BODY_ZONE_HEAD || limb.body_zone == BODY_ZONE_CHEST) + limb.is_dimorphic = TRUE + limb.skin_tone ||= skintone + limb.limb_id = SPECIES_HUMAN + limb.should_draw_greyscale = TRUE + limb.name = "human [parse_zone(limb.body_zone)]" + limb.update_limb() + limb.brute_reduction = 5 + limb.burn_reduction = 4 diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index a9441bf52ae..306a3c02a2d 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -16,7 +16,7 @@ mutanteyes = /obj/item/organ/eyes/dullahan mutanttongue = /obj/item/organ/tongue/dullahan mutantears = /obj/item/organ/ears/dullahan - limbs_id = "human" + examine_limb_id = SPECIES_HUMAN skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN @@ -38,7 +38,6 @@ var/obj/item/bodypart/head/head = human.get_bodypart(BODY_ZONE_HEAD) if(head) - head.no_update = TRUE head.drop_limb() if(!QDELETED(head)) //drop_limb() deletes the limb if no drop location exists and character setup dummies are located in nullspace. diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index add9c4ed0ce..e4a97328772 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -1,5 +1,5 @@ /datum/species/ethereal - name = "Ethereal" + name = "\improper Ethereal" id = SPECIES_ETHEREAL attack_verb = "burn" attack_sound = 'sound/weapons/etherealhit.ogg' @@ -28,6 +28,15 @@ hair_color = "fixedmutcolor" hair_alpha = 140 + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/ethereal, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/ethereal, + BODY_ZONE_HEAD = /obj/item/bodypart/head/ethereal, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/ethereal, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/ethereal, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/ethereal, + ) + var/current_color var/EMPeffect = FALSE var/emageffect = FALSE @@ -66,6 +75,12 @@ var/obj/item/organ/heart/ethereal/ethereal_heart = C.getorganslot(ORGAN_SLOT_HEART) ethereal_heart.ethereal_color = default_color + //The following code is literally only to make admin-spawned ethereals not be black. + C.dna.features["mcolor"] = C.dna.features["ethcolor"] //Ethcolor and Mut color are both dogshit and i hate them + for(var/obj/item/bodypart/limb as anything in C.bodyparts) + if(limb.limb_id == SPECIES_ETHEREAL) + limb.update_limb(is_creating = TRUE) + /datum/species/ethereal/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) UnregisterSignal(C, COMSIG_ATOM_EMAG_ACT) UnregisterSignal(C, COMSIG_ATOM_EMP_ACT) @@ -85,6 +100,9 @@ /datum/species/ethereal/spec_updatehealth(mob/living/carbon/human/H) . = ..() + if(!ethereal_light) + return + if(H.stat != DEAD && !EMPeffect) var/healthpercent = max(H.health, 0) / 100 if(!emageffect) @@ -95,8 +113,7 @@ else ethereal_light.set_light_on(FALSE) fixed_mut_color = rgb(128,128,128) - H.update_body() - H.update_hair() // This should fix the ethereal hair not changing with body, no clue as to why hair is not in update_body but okay + H.update_body(is_creating = TRUE) /datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/H, severity) SIGNAL_HANDLER diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 632c424ecd2..5f67636bf5c 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -3,7 +3,6 @@ name = "Felinid" id = SPECIES_FELINE say_mod = "meows" - limbs_id = "human" mutant_bodyparts = list("tail_human" = "Cat", "ears" = "Cat", "wings" = "None") @@ -17,6 +16,7 @@ payday_modifier = 0.75 ass_image = 'icons/ass/asscat.png' family_heirlooms = list(/obj/item/toy/cattoy) + examine_limb_id = SPECIES_HUMAN //Curiosity killed the cat's wagging tail. /datum/species/human/felinid/spec_death(gibbed, mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index d7bd542c795..7a781dedddd 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -1,7 +1,7 @@ /datum/species/fly name = "Flyperson" plural_form = "Flypeople" - id = SPECIES_FLY + id = SPECIES_FLYPERSON say_mod = "buzzes" species_traits = list(HAS_FLESH, HAS_BONE, TRAIT_ANTENNAE) inherent_traits = list( @@ -27,6 +27,15 @@ mutantappendix = /obj/item/organ/appendix/fly mutant_organs = list(/obj/item/organ/fly, /obj/item/organ/fly/groin) + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/fly, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/fly, + BODY_ZONE_HEAD = /obj/item/bodypart/head/fly, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/fly, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/fly, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/fly, + ) + /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) if(chem.type == /datum/reagent/toxin/pestkiller) H.adjustToxLoss(3 * REAGENTS_EFFECT_MULTIPLIER * delta_time) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 0f4d4629cb5..05518cee211 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -36,8 +36,17 @@ species_language_holder = /datum/language_holder/golem // To prevent golem subtypes from overwhelming the odds when random species // changes, only the Random Golem type can be chosen - limbs_id = "golem" fixed_mut_color = "#aaaaaa" + + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/golem, + BODY_ZONE_HEAD = /obj/item/bodypart/head/golem, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/golem, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/golem, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/golem, + ) + var/info_text = "As an Iron Golem, you don't have any special traits." var/random_eligible = TRUE //If false, the golem subtype can't be made through golem mutation toxin @@ -101,6 +110,7 @@ info_text = "As an Adamantine Golem, you possess special vocal cords allowing you to \"resonate\" messages to all golems. Your unique mineral makeup makes you immune to most types of magic." prefix = "Adamantine" special_names = null + examine_limb_id = SPECIES_GOLEM /datum/species/golem/adamantine/on_species_gain(mob/living/carbon/C, datum/species/old_species) ..() @@ -135,6 +145,7 @@ heatmod = 0 //fine until they blow up prefix = "Plasma" special_names = list("Flood","Fire","Bar","Man") + examine_limb_id = SPECIES_GOLEM var/boom_warning = FALSE var/datum/action/innate/ignite/ignite @@ -192,6 +203,7 @@ info_text = "As a Diamond Golem, you are more resistant than the average golem." prefix = "Diamond" special_names = list("Back","Grill") + examine_limb_id = SPECIES_GOLEM //Faster but softer and less armoured /datum/species/golem/gold @@ -204,6 +216,7 @@ info_text = "As a Gold Golem, you are faster but less resistant than the average golem." prefix = "Golden" special_names = list("Boy") + examine_limb_id = SPECIES_GOLEM //Heavier, thus higher chance of stunning when punching /datum/species/golem/silver @@ -215,6 +228,7 @@ info_text = "As a Silver Golem, your attacks have a higher chance of stunning. Being made of silver, your body is immune to most types of magic." prefix = "Silver" special_names = list("Surfer", "Chariot", "Lining") + examine_limb_id = SPECIES_GOLEM /datum/species/golem/silver/on_species_gain(mob/living/carbon/C, datum/species/old_species) ..() @@ -241,6 +255,7 @@ attack_sound = 'sound/effects/meteorimpact.ogg' //hits pretty hard prefix = "Plasteel" special_names = null + examine_limb_id = SPECIES_GOLEM /datum/species/golem/plasteel/negates_gravity(mob/living/carbon/human/H) return TRUE @@ -263,6 +278,7 @@ burnmod = 0.9 prefix = "Titanium" special_names = list("Dioxide") + examine_limb_id = SPECIES_GOLEM /datum/species/golem/titanium/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() @@ -282,6 +298,7 @@ burnmod = 0.8 prefix = "Plastitanium" special_names = null + examine_limb_id = SPECIES_GOLEM /datum/species/golem/plastitanium/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() @@ -304,12 +321,13 @@ info_text = "As an Alloy Golem, you are made of advanced alien materials: you are faster and regenerate over time. You are, however, only able to be heard by other alloy golems." prefix = "Alien" special_names = list("Outsider", "Technology", "Watcher", "Stranger") //ominous and unknown + examine_limb_id = SPECIES_GOLEM //Regenerates because self-repairing super-advanced alien tech /datum/species/golem/alloy/spec_life(mob/living/carbon/human/H, delta_time, times_fired) if(H.stat == DEAD) return - H.heal_overall_damage(1 * delta_time, 1 * delta_time, 0, BODYPART_ORGANIC) + H.heal_overall_damage(1 * delta_time, 1 * delta_time, 0, BODYTYPE_ORGANIC) H.adjustToxLoss(-1 * delta_time) H.adjustOxyLoss(-1 * delta_time) @@ -343,6 +361,7 @@ human_surname_chance = 0 special_name_chance = 100 inherent_factions = list("plants", "vines") + examine_limb_id = SPECIES_GOLEM /datum/species/golem/wood/spec_life(mob/living/carbon/human/H, delta_time, times_fired) if(H.stat == DEAD) @@ -355,7 +374,7 @@ if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL) H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL) if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYPART_ORGANIC) + H.heal_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYTYPE_ORGANIC) H.adjustToxLoss(-0.5 * delta_time) H.adjustOxyLoss(-0.5 * delta_time) @@ -388,6 +407,7 @@ prefix = "Uranium" special_names = list("Oxide", "Rod", "Meltdown", "235") COOLDOWN_DECLARE(radiation_emission_cooldown) + examine_limb_id = SPECIES_GOLEM /datum/species/golem/uranium/proc/radiation_emission(mob/living/carbon/human/H) if(!COOLDOWN_FINISHED(src, radiation_emission_cooldown)) @@ -424,6 +444,7 @@ attack_sound = 'sound/effects/shovel_dig.ogg' prefix = "Sand" special_names = list("Castle", "Bag", "Dune", "Worm", "Storm") + examine_limb_id = SPECIES_GOLEM /datum/species/golem/sand/spec_death(gibbed, mob/living/carbon/human/H) H.visible_message(span_danger("[H] turns into a pile of sand!")) @@ -455,6 +476,7 @@ attack_sound = 'sound/effects/glassbr2.ogg' prefix = "Glass" special_names = list("Lens", "Prism", "Fiber", "Bead") + examine_limb_id = SPECIES_GOLEM /datum/species/golem/glass/spec_death(gibbed, mob/living/carbon/human/H) playsound(H, SFX_SHATTER, 70, TRUE) @@ -490,6 +512,7 @@ attack_sound = 'sound/effects/phasein.ogg' prefix = "Bluespace" special_names = list("Crystal", "Polycrystal") + examine_limb_id = SPECIES_GOLEM var/datum/action/innate/unstable_teleport/unstable_teleport var/teleport_cooldown = 100 @@ -605,6 +628,7 @@ attack_sound = 'sound/items/airhorn2.ogg' prefix = "Bananium" special_names = null + examine_limb_id = SPECIES_GOLEM /// Cooldown for producing honks COOLDOWN_DECLARE(honkooldown) @@ -684,7 +708,6 @@ /datum/species/golem/runic name = "Runic Golem" id = SPECIES_GOLEM_CULT - limbs_id = "cultgolem" sexes = FALSE info_text = "As a Runic Golem, you possess eldritch powers granted by the Elder Goddess Nar'Sie." species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) //no mutcolors @@ -709,6 +732,15 @@ special_names = null inherent_factions = list("cult") species_language_holder = /datum/language_holder/golem/runic + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem/cult, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/golem/cult, + BODY_ZONE_HEAD = /obj/item/bodypart/head/golem/cult, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/golem/cult, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/golem/cult, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/golem/cult, + ) + var/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem/phase_shift var/obj/effect/proc_holder/spell/pointed/abyssal_gaze/abyssal_gaze var/obj/effect/proc_holder/spell/pointed/dominate/dominate @@ -753,7 +785,6 @@ /datum/species/golem/cloth name = "Cloth Golem" id = SPECIES_GOLEM_CLOTH - limbs_id = "clothgolem" sexes = FALSE info_text = "As a Cloth Golem, you are able to reform yourself after death, provided your remains aren't burned or destroyed. You are, of course, very flammable. \ Being made of cloth, your body is magic resistant and faster than that of other golems, but weaker and less resilient." @@ -780,6 +811,14 @@ punchdamagehigh = 8 // not as heavy as stone prefix = "Cloth" special_names = null + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem/cloth, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/golem/cloth, + BODY_ZONE_HEAD = /obj/item/bodypart/head/golem/cloth, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/golem/cloth, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/golem/cloth, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/golem/cloth, + ) /datum/species/golem/cloth/on_species_gain(mob/living/carbon/C, datum/species/old_species) ..() @@ -942,6 +981,7 @@ special_names = list("Sheet", "Bag", "Bottle") fixed_mut_color = "fffa" info_text = "As a Plastic Golem, you are capable of ventcrawling and passing through plastic flaps as long as you are naked." + examine_limb_id = SPECIES_GOLEM /datum/species/golem/bronze name = "Bronze Golem" @@ -952,6 +992,7 @@ info_text = "As a Bronze Golem, you are very resistant to loud noises, and make loud noises if something hard hits you, however this ability does hurt your hearing." special_step_sounds = list('sound/machines/clockcult/integration_cog_install.ogg', 'sound/magic/clockwork/fellowship_armory.ogg' ) mutantears = /obj/item/organ/ears/bronze + examine_limb_id = SPECIES_GOLEM var/last_gong_time = 0 var/gong_cooldown = 150 @@ -1033,7 +1074,6 @@ TRAIT_NODISMEMBER, TRAIT_NOFLASH, ) - limbs_id = "c_golem" //special sprites attack_verb = "whips" attack_sound = 'sound/weapons/whip.ogg' miss_sound = 'sound/weapons/etherealmiss.ogg' @@ -1045,6 +1085,14 @@ punchdamagelow = 4 punchstunthreshold = 7 punchdamagehigh = 8 + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem/cardboard, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/golem/cardboard, + BODY_ZONE_HEAD = /obj/item/bodypart/head/golem/cardboard, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/golem/cardboard, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/golem/cardboard, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/golem/cardboard, + ) var/last_creation = 0 var/brother_creation_cooldown = 300 @@ -1096,12 +1144,11 @@ info_text = "As a Leather Golem, you are flammable, but you can grab things with incredible ease, allowing all your grabs to start at a strong level." grab_sound = 'sound/weapons/whipgrab.ogg' attack_sound = 'sound/weapons/whip.ogg' - + examine_limb_id = SPECIES_GOLEM /datum/species/golem/durathread name = "Durathread Golem" id = SPECIES_GOLEM_DURATHREAD prefix = "Durathread" - limbs_id = "d_golem" special_names = list("Boll","Weave") species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) fixed_mut_color = null @@ -1120,6 +1167,14 @@ TRAIT_NOFLASH, ) info_text = "As a Durathread Golem, your strikes will cause those your targets to start choking, but your woven body won't withstand fire as well." + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem/durathread, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/golem/durathread, + BODY_ZONE_HEAD = /obj/item/bodypart/head/golem/durathread, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/golem/durathread, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/golem/durathread, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/golem/durathread, + ) /datum/species/golem/durathread/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target) . = ..() @@ -1130,7 +1185,6 @@ id = SPECIES_GOLEM_BONE say_mod = "rattles" prefix = "Bone" - limbs_id = "b_golem" special_names = list("Head", "Broth", "Fracture", "Rattler", "Appetit") liked_food = GROSS | MEAT | RAW toxic_food = null @@ -1159,6 +1213,14 @@ ) species_language_holder = /datum/language_holder/golem/bone info_text = "As a Bone Golem, You have a powerful spell that lets you chill your enemies with fear, and milk heals you! Just make sure to watch our for bone-hurting juice." + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem/bone, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/golem/bone, + BODY_ZONE_HEAD = /obj/item/bodypart/head/golem/bone, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/golem/bone, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/golem/bone, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/golem/bone, + ) var/datum/action/innate/bonechill/bonechill /datum/species/golem/bone/on_species_gain(mob/living/carbon/C, datum/species/old_species) @@ -1238,7 +1300,6 @@ /datum/species/golem/snow name = "Snow Golem" id = SPECIES_GOLEM_SNOW - limbs_id = "sn_golem" fixed_mut_color = null //custom sprites armor = 45 //down from 55 burnmod = 3 //melts easily @@ -1259,7 +1320,14 @@ TRAIT_PIERCEIMMUNE, TRAIT_NODISMEMBER, ) - + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem/snow, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/golem/snow, + BODY_ZONE_HEAD = /obj/item/bodypart/head/golem/snow, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/golem/snow, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/golem/snow, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/golem/snow, + ) var/obj/effect/proc_holder/spell/targeted/conjure_item/snowball/ball var/obj/effect/proc_holder/spell/aimed/cryo/cryo @@ -1318,6 +1386,7 @@ TRAIT_NODISMEMBER, TRAIT_CHUNKYFINGERS, ) + examine_limb_id = SPECIES_GOLEM /datum/species/golem/mhydrogen/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 271bd95c5c6..85f66b89c6f 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -1,5 +1,5 @@ /datum/species/human - name = "Human" + name = "\improper Human" id = SPECIES_HUMAN default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 1988641a375..e2ef3f14a6c 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -1,6 +1,6 @@ /datum/species/jelly // Entirely alien beings that seem to be made entirely out of gel. They have three eyes and a skeleton visible within them. - name = "Jellyperson" + name = "\improper Jellyperson" plural_form = "Jellypeople" id = SPECIES_JELLYPERSON default_color = "00FF90" @@ -27,6 +27,15 @@ species_language_holder = /datum/language_holder/jelly ass_image = 'icons/ass/assslime.png' + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/jelly, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/jelly, + BODY_ZONE_HEAD = /obj/item/bodypart/head/jelly, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/jelly, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/jelly, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/jelly, + ) + /datum/species/jelly/on_species_loss(mob/living/carbon/C) if(regenerate_limbs) regenerate_limbs.Remove(C) @@ -136,7 +145,7 @@ //Slime people are able to split like slimes, retaining a single mind that can swap between bodies at will, even after death. /datum/species/jelly/slime - name = "Slimeperson" + name = "\improper Slimeperson" plural_form = "Slimepeople" id = SPECIES_SLIMEPERSON default_color = "00FFFF" @@ -148,6 +157,15 @@ var/list/mob/living/carbon/bodies var/datum/action/innate/swap_body/swap_body + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/slime, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/slime, + BODY_ZONE_HEAD = /obj/item/bodypart/head/slime, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/slime, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/slime, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/slime, + ) + /datum/species/jelly/slime/on_species_loss(mob/living/carbon/C) if(slime_split) slime_split.Remove(C) @@ -425,6 +443,7 @@ name = "Luminescent" plural_form = null id = SPECIES_LUMINESCENT + examine_limb_id = SPECIES_JELLYPERSON var/glow_intensity = LUMINESCENT_DEFAULT_GLOW var/obj/effect/dummy/luminescent_glow/glow var/obj/item/slime_extract/current_extract @@ -433,6 +452,7 @@ var/datum/action/innate/use_extract/major/extract_major var/extract_cooldown = 0 + //Species datums don't normally implement destroy, but JELLIES SUCK ASS OUT OF A STEEL STRAW /datum/species/jelly/luminescent/Destroy(force, ...) current_extract = null @@ -605,9 +625,10 @@ //Stargazers are the telepathic branch of jellypeople, able to project psychic messages and to link minds with willing participants. /datum/species/jelly/stargazer - name = "Stargazer" + name = "\improper Stargazer" plural_form = null id = SPECIES_STARGAZER + examine_limb_id = SPECIES_JELLYPERSON /// Special "project thought" telepathy action for stargazers. var/datum/action/innate/project_thought/project_action diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 24981dd9fc2..2e695aa2e84 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -1,6 +1,6 @@ /datum/species/lizard // Reptilian humanoids with scaled skin and tails. - name = "Lizardperson" + name = "\improper Lizardperson" plural_form = "Lizardfolk" id = SPECIES_LIZARD say_mod = "hisses" @@ -35,12 +35,23 @@ deathsound = 'sound/voice/lizard/deathsound.ogg' wings_icons = list("Dragon") species_language_holder = /datum/language_holder/lizard + digitigrade_customization = DIGITIGRADE_OPTIONAL + // Lizards are coldblooded and can stand a greater temperature range than humans bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT + 20) // This puts lizards 10 above lavaland max heat for ash lizards. bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT - 10) ass_image = 'icons/ass/asslizard.png' + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/lizard, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/lizard, + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/lizard, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/lizard, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/lizard, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/lizard, + ) + /// Lizards are cold blooded and do not stabilize body temperature naturally /datum/species/lizard/body_temperature_core(mob/living/carbon/human/humi, delta_time, times_fired) return @@ -169,8 +180,7 @@ Lizard subspecies: ASHWALKERS /datum/species/lizard/ashwalker name = "Ash Walker" id = SPECIES_LIZARD_ASH - limbs_id = "lizard" - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE,HAS_FLESH,HAS_BONE) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAS_FLESH,HAS_BONE) mutantlungs = /obj/item/organ/lungs/ashwalker inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, @@ -179,14 +189,14 @@ Lizard subspecies: ASHWALKERS TRAIT_VIRUSIMMUNE, ) species_language_holder = /datum/language_holder/lizard/ash - + digitigrade_customization = DIGITIGRADE_FORCED + examine_limb_id = SPECIES_LIZARD /* Lizard subspecies: SILVER SCALED */ /datum/species/lizard/silverscale name = "Silver Scale" id = SPECIES_LIZARD_SILVER - limbs_id = "lizard" inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, @@ -203,6 +213,7 @@ Lizard subspecies: SILVER SCALED mutanttongue = /obj/item/organ/tongue/lizard/silver armor = 10 //very light silvery scales soften blows changesource_flags = MIRROR_BADMIN | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN + examine_limb_id = SPECIES_LIZARD ///stored mutcolor for when we turn back off of a silverscale. var/old_mutcolor ///stored eye color for when we turn back off of a silverscale. diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 9e835ba3d80..18bd734f952 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -2,6 +2,7 @@ name = "Monkey" id = SPECIES_MONKEY say_mod = "chimpers" + bodytype = BODYTYPE_ORGANIC | BODYTYPE_MONKEY attack_verb = "bite" attack_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' @@ -10,7 +11,6 @@ mutant_bodyparts = list("tail_monkey" = "Monkey") skinned_type = /obj/item/stack/sheet/animalhide/monkey meat = /obj/item/food/meat/slab/monkey - allowed_animal_origin = MONKEY_BODY knife_butcher_results = list(/obj/item/food/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1) species_traits = list( HAS_FLESH, @@ -41,14 +41,14 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN | SLIME_EXTRACT liked_food = MEAT | FRUIT disliked_food = CLOTH - limbs_id = "monkey" damage_overlay_type = "monkey" sexes = FALSE punchdamagelow = 1 punchdamagehigh = 3 punchstunthreshold = 4 // no stun punches species_language_holder = /datum/language_holder/monkey - bodypart_overides = list( + + bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/monkey, BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/monkey, BODY_ZONE_HEAD = /obj/item/bodypart/head/monkey, diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 5e06277ac7e..6a805be1f0f 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -1,5 +1,5 @@ /datum/species/moth - name = "Mothman" + name = "\improper Mothman" plural_form = "Mothmen" id = SPECIES_MOTH say_mod = "flutters" @@ -29,6 +29,15 @@ payday_modifier = 0.75 family_heirlooms = list(/obj/item/flashlight/lantern/heirloom_moth) + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/moth, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/moth, + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/moth, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/moth, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/moth, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/moth, + ) + /datum/species/moth/regenerate_organs(mob/living/carbon/C, datum/species/old_species, replace_current= TRUE, list/excluded_zones, visual_only) . = ..() if(ishuman(C)) diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 08f15068520..db340e41898 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -34,6 +34,15 @@ var/datum/martial_art/mushpunch/mush species_language_holder = /datum/language_holder/mushroom + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/mushroom, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/mushroom, + BODY_ZONE_HEAD = /obj/item/bodypart/head/mushroom, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/mushroom, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/mushroom, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/mushroom, + ) + /datum/species/mush/check_roundstart_eligible() return FALSE //hard locked out of roundstart on the order of design lead kor, this can be removed in the future when planetstation is here OR SOMETHING but right now we have a problem with races. diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index f7d2c974b7a..5d34c91b2b3 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -1,5 +1,5 @@ /datum/species/plasmaman - name = "Plasmaman" + name = "\improper Plasmaman" plural_form = "Plasmamen" id = SPECIES_PLASMAMAN say_mod = "rattles" @@ -34,6 +34,15 @@ outfit_important_for_life = /datum/outfit/plasmaman species_language_holder = /datum/language_holder/skeleton + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/plasmaman, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/plasmaman, + BODY_ZONE_HEAD = /obj/item/bodypart/head/plasmaman, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/plasmaman, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/plasmaman, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/plasmaman, + ) + // Body temperature for Plasmen is much lower human as they can handle colder environments bodytemp_normal = (BODYTEMP_NORMAL - 40) // The minimum amount they stabilize per tick is reduced making hot areas harder to deal with @@ -56,7 +65,7 @@ var/atmos_sealed = CanIgniteMob(H) && (isclothing(H.wear_suit) && H.wear_suit.clothing_flags & STOPSPRESSUREDAMAGE) && (isclothing(H.head) && H.head.clothing_flags & STOPSPRESSUREDAMAGE) var/flammable_limb = FALSE for(var/obj/item/bodypart/found_bodypart as anything in H.bodyparts)//If any plasma based limb is found the plasmaman will attempt to autoignite - if(found_bodypart.status == BODYPART_ORGANIC && (found_bodypart.species_id == SPECIES_PLASMAMAN || HAS_TRAIT(found_bodypart, TRAIT_PLASMABURNT))) //Allows for "donated" limbs and augmented limbs to prevent autoignition + if(IS_ORGANIC_LIMB(found_bodypart) && (found_bodypart.limb_id == SPECIES_PLASMAMAN || HAS_TRAIT(found_bodypart, TRAIT_PLASMABURNT))) //Allows for "donated" limbs and augmented limbs to prevent autoignition flammable_limb = TRUE break if(!flammable_limb && !H.on_fire) //Allows their suit to attempt to autoextinguish if augged and on fire diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index ee51875bbac..798629a30cf 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -1,6 +1,6 @@ /datum/species/pod // A mutation caused by a human being ressurected in a revival pod. These regain health in light, and begin to wither in darkness. - name = "Podperson" + name = "\improper Podperson" plural_form = "Podpeople" id = SPECIES_PODPERSON default_color = "59CE00" @@ -29,6 +29,15 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/plant + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/pod, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/pod, + BODY_ZONE_HEAD = /obj/item/bodypart/head/pod, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/pod, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/pod, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/pod, + ) + /datum/species/pod/spec_life(mob/living/carbon/human/H, delta_time, times_fired) if(H.stat == DEAD) return @@ -41,7 +50,7 @@ if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL) H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL) if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYPART_ORGANIC) + H.heal_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYTYPE_ORGANIC) H.adjustToxLoss(-0.5 * delta_time) H.adjustOxyLoss(-0.5 * delta_time) diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index e1013f5c658..4b905f35aa0 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -18,6 +18,15 @@ mutanteyes = /obj/item/organ/eyes/night_vision species_language_holder = /datum/language_holder/shadowpeople + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/shadow, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/shadow, + BODY_ZONE_HEAD = /obj/item/bodypart/head/shadow, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/shadow, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/shadow, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/shadow, + ) + /datum/species/shadow/spec_life(mob/living/carbon/human/H, delta_time, times_fired) var/turf/T = H.loc @@ -25,9 +34,9 @@ var/light_amount = T.get_lumcount() if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) //if there's enough light, start dying - H.take_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYPART_ORGANIC) + H.take_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYTYPE_ORGANIC) else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark - H.heal_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYPART_ORGANIC) + H.heal_overall_damage(0.5 * delta_time, 0.5 * delta_time, 0, BODYTYPE_ORGANIC) /datum/species/shadow/check_roundstart_eligible() if(SSevents.holidays && SSevents.holidays[HALLOWEEN]) diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 4e3726d80c3..302f06f052b 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -38,6 +38,15 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN species_language_holder = /datum/language_holder/skeleton + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/skeleton, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/skeleton, + BODY_ZONE_HEAD = /obj/item/bodypart/head/skeleton, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/skeleton, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/skeleton, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/skeleton, + ) + /datum/species/skeleton/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) . = ..() C.set_safe_hunger_level() diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index d8c073a5da2..46ff16c832f 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -24,6 +24,15 @@ mutanttongue = /obj/item/organ/tongue/snail exotic_blood = /datum/reagent/lube + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/snail, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/snail, + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/snail, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/snail, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/snail, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/snail + ) + /datum/species/snail/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) if(istype(chem,/datum/reagent/consumable/salt)) H.adjustFireLoss(2 * REAGENTS_EFFECT_MULTIPLIER * delta_time) diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm deleted file mode 100644 index 5e0f37de8cf..00000000000 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ /dev/null @@ -1,142 +0,0 @@ -/datum/species/synth - name = "Synth" //inherited from the real species, for health scanners and things - id = SPECIES_SYNTH - say_mod = "beep boops" //inherited from a user's real species - sexes = 0 - species_traits = list(NOTRANSSTING, NO_DNA_COPY) //all of these + whatever we inherit from the real species - inherent_traits = list( - TRAIT_ADVANCEDTOOLUSER, - TRAIT_CAN_STRIP, - TRAIT_VIRUSIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_NOLIMBDISABLE, - TRAIT_NOHUNGER, - TRAIT_NOBREATH, - ) - inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID - meat = null - damage_overlay_type = "synth" - limbs_id = "synth" - ///If your health becomes equal to or less than this value, your disguise is supposed to break. Unfortunately, that feature currently isn't implemented, so currently, all this threshold is used for is (I kid you not) determining whether or not your speech uses SPAN_CLOWN while you're disguised as a bananium golem. See the handle_speech() proc further down in this file for more information on that check. - var/disguise_fail_health = 75 - var/datum/species/fake_species //a species to do most of our work for us, unless we're damaged - var/list/initial_species_traits //for getting these values back for assume_disguise() - var/list/initial_inherent_traits - wings_icons = list("Robotic") - changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC - species_language_holder = /datum/language_holder/synthetic - -/datum/species/synth/New() - initial_species_traits = species_traits.Copy() - initial_inherent_traits = inherent_traits.Copy() - ..() - -/datum/species/synth/military - name = "Military Synth" - id = SPECIES_SYNTH_MILITARY - armor = 25 - punchdamagelow = 10 - punchdamagehigh = 19 - punchstunthreshold = 14 //about 50% chance to stun - disguise_fail_health = 50 - changesource_flags = MIRROR_BADMIN | WABBAJACK - -/datum/species/synth/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) - ..() - assume_disguise(old_species, H) - RegisterSignal(H, COMSIG_MOB_SAY, .proc/handle_speech) - H.set_safe_hunger_level() - -/datum/species/synth/on_species_loss(mob/living/carbon/human/H) - . = ..() - UnregisterSignal(H, COMSIG_MOB_SAY) - -/datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) - if(chem.type == /datum/reagent/medicine/c2/synthflesh) - chem.expose_mob(H, TOUCH, 2 * REAGENTS_EFFECT_MULTIPLIER * delta_time,0) //heal a little - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) - return TRUE - return ..() - - -/datum/species/synth/proc/assume_disguise(datum/species/S, mob/living/carbon/human/H) - if(S && !istype(S, type)) - name = S.name - say_mod = S.say_mod - sexes = S.sexes - species_traits = initial_species_traits.Copy() - inherent_traits = initial_inherent_traits.Copy() - species_traits |= S.species_traits - inherent_traits |= S.inherent_traits - attack_verb = S.attack_verb - attack_effect = S.attack_effect - attack_sound = S.attack_sound - miss_sound = S.miss_sound - meat = S.meat - mutant_bodyparts = S.mutant_bodyparts.Copy() - mutant_organs = S.mutant_organs.Copy() - nojumpsuit = S.nojumpsuit - no_equip = S.no_equip.Copy() - limbs_id = S.limbs_id - use_skintones = S.use_skintones - fixed_mut_color = S.fixed_mut_color - hair_color = S.hair_color - fake_species = new S.type - else - name = initial(name) - say_mod = initial(say_mod) - species_traits = initial_species_traits.Copy() - inherent_traits = initial_inherent_traits.Copy() - attack_verb = initial(attack_verb) - attack_effect = initial(attack_verb) - attack_sound = initial(attack_sound) - miss_sound = initial(miss_sound) - mutant_bodyparts = list() - nojumpsuit = initial(nojumpsuit) - no_equip = list() - qdel(fake_species) - fake_species = null - meat = initial(meat) - limbs_id = "synth" - use_skintones = 0 - sexes = 0 - fixed_mut_color = "" - hair_color = "" - - for(var/X in H.bodyparts) //propagates the damage_overlay changes - var/obj/item/bodypart/BP = X - BP.update_limb() - H.update_body_parts() //to update limb icon cache with the new damage overlays - -//Proc redirects: -//Passing procs onto the fake_species, to ensure we look as much like them as possible - -/datum/species/synth/handle_hair(mob/living/carbon/human/H, forced_colour) - if(fake_species) - fake_species.handle_hair(H, forced_colour) - else - return ..() - - -/datum/species/synth/handle_body(mob/living/carbon/human/H) - if(fake_species) - fake_species.handle_body(H) - else - return ..() - - -/datum/species/synth/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour) - if(fake_species) - fake_species.handle_mutant_bodyparts(H,forced_colour) - else - return ..() - - -/datum/species/synth/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - if (isliving(source)) // yeah it's gonna be living but just to be clean - var/mob/living/L = source - if(fake_species && L.health > disguise_fail_health) - switch(fake_species.type) - if (/datum/species/golem/bananium) - speech_args[SPEECH_SPANS] |= SPAN_CLOWN diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 88ddce6b7d1..608c8436f41 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -31,7 +31,7 @@ use_skintones = TRUE mutantheart = /obj/item/organ/heart/vampire mutanttongue = /obj/item/organ/tongue/vampire - limbs_id = "human" + examine_limb_id = SPECIES_HUMAN skinned_type = /obj/item/stack/sheet/animalhide/human ///some starter text sent to the vampire initially, because vampires have shit to do to stay alive var/info_text = "You are a Vampire. You will slowly but constantly lose blood if outside of a coffin. If inside a coffin, you will slowly heal. You may gain more blood by grabbing a live victim and using your drain ability." @@ -51,7 +51,7 @@ /datum/species/vampire/spec_life(mob/living/carbon/human/vampire, delta_time, times_fired) . = ..() if(istype(vampire.loc, /obj/structure/closet/crate/coffin)) - vampire.heal_overall_damage(2 * delta_time, 2 * delta_time, 0, BODYPART_ORGANIC) + vampire.heal_overall_damage(2 * delta_time, 2 * delta_time, 0, BODYTYPE_ORGANIC) vampire.adjustToxLoss(-2 * delta_time) vampire.adjustOxyLoss(-2 * delta_time) vampire.adjustCloneLoss(-2 * delta_time) diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index f428a46509e..fd624b40ddc 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -3,7 +3,7 @@ /datum/species/zombie // 1spooky name = "High-Functioning Zombie" - id = SPECIES_ZOMBIE_HALLOWEEN + id = SPECIES_ZOMBIE say_mod = "moans" sexes = 0 meat = /obj/item/food/meat/slab/human/mutant/zombie @@ -36,6 +36,15 @@ bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_EXIST // Take damage at fire temp bodytemp_cold_damage_limit = MINIMUM_TEMPERATURE_TO_MOVE // take damage below minimum movement temp + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/zombie, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/zombie, + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/zombie, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/zombie, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/zombie, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/zombie + ) + /// Zombies do not stabilize body temperature they are the walking dead and are cold blooded /datum/species/zombie/body_temperature_core(mob/living/carbon/human/humi, delta_time, times_fired) return @@ -69,8 +78,8 @@ /datum/species/zombie/infectious name = "Infectious Zombie" - id = SPECIES_ZOMBIE - limbs_id = "zombie" + id = SPECIES_ZOMBIE_INFECTIOUS + examine_limb_id = SPECIES_ZOMBIE mutanthands = /obj/item/zombie_hand armor = 20 // 120 damage to KO a zombie, which kills it speedmod = 1.6 @@ -132,19 +141,38 @@ infection.Insert(C) // Your skin falls off -/datum/species/krokodil_addict - name = "Human" - id = SPECIES_ADDICT - limbs_id = "zombie" //They look like zombies +/datum/species/human/krokodil_addict + name = "\improper Human" + id = SPECIES_ZOMBIE_KROKODIL + examine_limb_id = SPECIES_HUMAN sexes = 0 - meat = /obj/item/food/meat/slab/human/mutant/zombie mutanttongue = /obj/item/organ/tongue/zombie changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN - species_traits = list(HAS_FLESH, HAS_BONE) - inherent_traits = list( - TRAIT_ADVANCEDTOOLUSER, - TRAIT_CAN_STRIP, - TRAIT_EASILY_WOUNDED, + + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/zombie, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/zombie, + BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/zombie, + BODY_ZONE_R_ARM = /obj/item/bodypart/r_arm/zombie, + BODY_ZONE_L_LEG = /obj/item/bodypart/l_leg/zombie, + BODY_ZONE_R_LEG = /obj/item/bodypart/r_leg/zombie ) +/datum/species/human/krokodil_addict/replace_body(mob/living/carbon/target, datum/species/new_species) + ..() + var/skintone + if(ishuman(target)) + var/mob/living/carbon/human/human_target = target + skintone = human_target.skin_tone + + for(var/obj/item/bodypart/limb as anything in target.bodyparts) + if(IS_ORGANIC_LIMB(limb)) + if(limb.body_zone == BODY_ZONE_HEAD || limb.body_zone == BODY_ZONE_CHEST) + limb.is_dimorphic = TRUE + limb.skin_tone ||= skintone + limb.limb_id = SPECIES_HUMAN + limb.should_draw_greyscale = TRUE + limb.name = "human [parse_zone(limb.body_zone)]" + limb.update_limb() + #undef REGENERATION_DELAY diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 5273d0dd930..9fe7e1ddcc3 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -14,6 +14,16 @@ return legcuffed return null +/mob/living/carbon/proc/get_all_worn_items() + return list( + back, + wear_mask, + wear_neck, + head, + handcuffed, + legcuffed, + ) + /mob/living/carbon/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1) for(var/slot in slots) if(equip_to_slot_if_possible(I, slots[slot], qdel_on_fail = 0, disable_warning = TRUE)) @@ -242,3 +252,26 @@ visible_message(span_notice("[src] takes [I] from [offerer]."), \ span_notice("You take [I] from [offerer].")) put_in_hands(I) + +///Returns a list of all body_zones covered by clothing +/mob/living/carbon/proc/get_covered_body_zones() + RETURN_TYPE(/list) + SHOULD_NOT_OVERRIDE(TRUE) + + var/covered_flags = NONE + var/list/all_worn_items = get_all_worn_items() + for(var/obj/item/worn_item in all_worn_items) + covered_flags |= worn_item.body_parts_covered + + return cover_flags2body_zones(covered_flags) + +///Returns a bitfield of all zones covered by clothing +/mob/living/carbon/proc/get_all_covered_flags() + SHOULD_NOT_OVERRIDE(TRUE) + + var/covered_flags = NONE + var/list/all_worn_items = get_all_worn_items() + for(var/obj/item/worn_item in all_worn_items) + covered_flags |= worn_item.body_parts_covered + + return covered_flags diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index f5ff872ee45..3b013b98a97 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -324,15 +324,11 @@ return /mob/living/carbon/proc/handle_bodyparts(delta_time, times_fired) - var/stam_regen = FALSE if(stam_regen_start_time <= world.time) - stam_regen = TRUE if(HAS_TRAIT_FROM(src, TRAIT_INCAPACITATED, STAMINA)) . |= BODYPART_LIFE_UPDATE_HEALTH //make sure we remove the stamcrit - for(var/I in bodyparts) - var/obj/item/bodypart/BP = I - if(BP.needs_processing) - . |= BP.on_life(delta_time, times_fired, stam_regen) + for(var/obj/item/bodypart/limb as anything in bodyparts) + . |= limb.on_life(delta_time, times_fired) /mob/living/carbon/proc/handle_organs(delta_time, times_fired) if(stat != DEAD) @@ -758,7 +754,7 @@ All effects don't start immediately, but rather get worse over time; the rate is if(limb.get_damage() >= limb.max_damage) limb.cremation_progress += rand(1 * delta_time, 2.5 * delta_time) if(limb.cremation_progress >= 100) - if(limb.status == BODYPART_ORGANIC) //Non-organic limbs don't burn + if(IS_ORGANIC_LIMB(limb)) //Non-organic limbs don't burn limb.drop_limb() limb.visible_message(span_warning("[src]'s [limb.name] crumbles into ash!")) qdel(limb) @@ -774,7 +770,7 @@ All effects don't start immediately, but rather get worse over time; the rate is if(head.get_damage() >= head.max_damage) head.cremation_progress += rand(1 * delta_time, 2.5 * delta_time) if(head.cremation_progress >= 100) - if(head.status == BODYPART_ORGANIC) //Non-organic limbs don't burn + if(IS_ORGANIC_LIMB(head)) //Non-organic limbs don't burn head.drop_limb() head.visible_message(span_warning("[src]'s head crumbles into ash!")) qdel(head) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 234e4eb8c02..36c2f1f3b7d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1340,9 +1340,7 @@ // Randomize everything but the species, which was already handled above. new_human.randomize_human_appearance(~RANDOMIZE_SPECIES) - new_human.update_body() - new_human.update_hair() - new_human.update_body_parts() + new_human.update_body(is_creating = TRUE) new_human.dna.update_dna_identity() new_mob = new_human diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 1100627ba53..4cef7a260d6 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -372,14 +372,14 @@ */ /proc/item_heal_robotic(mob/living/carbon/human/H, mob/user, brute_heal, burn_heal) var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) - if(affecting && affecting.status == BODYPART_ROBOTIC) + if(affecting && !IS_ORGANIC_LIMB(affecting)) var/dam //changes repair text based on how much brute/burn was supplied if(brute_heal > burn_heal) dam = 1 else dam = 0 if((brute_heal > 0 && affecting.brute_dam > 0) || (burn_heal > 0 && affecting.burn_dam > 0)) - if(affecting.heal_damage(brute_heal, burn_heal, 0, BODYPART_ROBOTIC)) + if(affecting.heal_damage(brute_heal, burn_heal, 0, BODYTYPE_ROBOTIC)) H.update_damage_overlays() user.visible_message(span_notice("[user] fixes some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.name]."), \ span_notice("You fix some of the [dam ? "dents on" : "burnt wires in"] [H == user ? "your" : "[H]'s"] [affecting.name].")) diff --git a/code/modules/mob_spawn/corpses/mining_corpses.dm b/code/modules/mob_spawn/corpses/mining_corpses.dm index 2d882c1f58b..ecbbc2001f3 100644 --- a/code/modules/mob_spawn/corpses/mining_corpses.dm +++ b/code/modules/mob_spawn/corpses/mining_corpses.dm @@ -187,7 +187,7 @@ /datum/outfit/consumed_dame/pre_equip(mob/living/carbon/human/dame, visualsOnly = FALSE) if(!visualsOnly) dame.gender = FEMALE - dame.body_type = FEMALE + dame.physique = FEMALE dame.update_body() if(prob(30)) back = /obj/item/nullrod/scythe/talking diff --git a/code/modules/ninja/suit/ninja_equipment_actions/energy_net_nets.dm b/code/modules/ninja/suit/ninja_equipment_actions/energy_net_nets.dm index 2d390a1b560..ab05eb6230b 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/energy_net_nets.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/energy_net_nets.dm @@ -24,16 +24,16 @@ buckle_lying = 0 buckle_prevents_pull = TRUE ///The creature currently caught in the net - var/mob/living/affecting + var/mob/living/affected_mob /obj/structure/energy_net/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0) if(damage_type == BRUTE || damage_type == BURN) playsound(src, 'sound/weapons/slash.ogg', 80, TRUE) /obj/structure/energy_net/Destroy() - if(!QDELETED(affecting)) - affecting.visible_message(span_notice("[affecting.name] is recovered from the energy net!"), span_notice("You are recovered from the energy net!"), span_hear("You hear a grunt.")) - affecting = null + if(!QDELETED(affected_mob)) + affected_mob.visible_message(span_notice("[affected_mob.name] is recovered from the energy net!"), span_notice("You are recovered from the energy net!"), span_hear("You hear a grunt.")) + affected_mob = null return ..() /obj/structure/energy_net/attack_paw(mob/user, list/modifiers) diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm index 29ffe4a5af0..66eb50438fe 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm @@ -34,7 +34,7 @@ ninja.Beam(net_target, "n_beam", time = 15) ninja.say("Get over here!", forced = "ninja net") var/obj/structure/energy_net/net = new /obj/structure/energy_net(net_target.drop_location()) - net.affecting = net_target + net.affected_mob = net_target ninja.visible_message(span_danger("[ninja] caught [net_target] with an energy net!"),span_notice("You caught [net_target] with an energy net!")) if(net_target.buckled) diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index a04ac4a7dd7..20b604afa1c 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -167,7 +167,7 @@ var/design_choice = tgui_alert(ninja, "Please choose your desired suit design.",,list("Original","New Age")) switch(design_choice) if("Original") - icon_state = ninja.body_type == "female" ? "s-ninjanf" : "s-ninjan" + icon_state = ninja.physique == "female" ? "s-ninjanf" : "s-ninjan" ninja.gloves.icon_state = "s-ninjan" ninja.gloves.inhand_icon_state = "s-ninjan" if("New Age") diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8610cbb8aab..3ae225e4b46 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -546,7 +546,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri return ..() var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) - if(affecting && affecting.status == BODYPART_ROBOTIC) + if(affecting && !IS_ORGANIC_LIMB(affecting)) if(user == H) user.visible_message(span_notice("[user] starts to fix some of the wires in [H]'s [affecting.name]."), span_notice("You start fixing some of the wires in [H == user ? "your" : "[H]'s"] [affecting.name].")) if(!do_mob(user, H, 50)) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 71686778ae6..3e593b513ec 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -116,10 +116,10 @@ to_chat(M, span_notice("[high_message]")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "smacked out", /datum/mood_event/narcotic_heavy, name) if(current_cycle == 35 && creation_purity <= 0.6) - if(!istype(M.dna.species, /datum/species/krokodil_addict)) + if(!istype(M.dna.species, /datum/species/human/krokodil_addict)) to_chat(M, span_userdanger("Your skin falls off easily!")) M.adjustBruteLoss(50*REM, 0) // holy shit your skin just FELL THE FUCK OFF - M.set_species(/datum/species/krokodil_addict) + M.set_species(/datum/species/human/krokodil_addict) ..() /datum/reagent/drug/krokodil/overdose_process(mob/living/M, delta_time, times_fired) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index cb58051ce77..0d5d2011b2c 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -296,7 +296,7 @@ /datum/reagent/medicine/oxandrolone/overdose_process(mob/living/M, delta_time, times_fired) if(M.getFireLoss()) //It only makes existing burns worse - M.adjustFireLoss(4.5 * REM * delta_time, FALSE, FALSE, BODYPART_ORGANIC) // it's going to be healing either 4 or 0.5 + M.adjustFireLoss(4.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5 . = TRUE ..() @@ -339,8 +339,8 @@ holder.add_reagent(/datum/reagent/consumable/sugar, 1) holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5) if(DT_PROB(18, delta_time)) - M.adjustBruteLoss(0.5, FALSE, FALSE, BODYPART_ORGANIC) - M.adjustFireLoss(0.5, FALSE, FALSE, BODYPART_ORGANIC) + M.adjustBruteLoss(0.5, FALSE, FALSE, BODYTYPE_ORGANIC) + M.adjustFireLoss(0.5, FALSE, FALSE, BODYTYPE_ORGANIC) . = TRUE ..() @@ -407,8 +407,8 @@ /datum/reagent/medicine/omnizine/overdose_process(mob/living/M, delta_time, times_fired) M.adjustToxLoss(1.5 * REM * delta_time, FALSE) M.adjustOxyLoss(1.5 * REM * delta_time, FALSE) - M.adjustBruteLoss(1.5 * REM * delta_time, FALSE, FALSE, BODYPART_ORGANIC) - M.adjustFireLoss(1.5 * REM * delta_time, FALSE, FALSE, BODYPART_ORGANIC) + M.adjustBruteLoss(1.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) + M.adjustFireLoss(1.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) ..() . = TRUE @@ -505,7 +505,7 @@ /datum/reagent/medicine/sal_acid/overdose_process(mob/living/M, delta_time, times_fired) if(M.getBruteLoss()) //It only makes existing bruises worse - M.adjustBruteLoss(4.5 * REM * delta_time, FALSE, FALSE, BODYPART_ORGANIC) // it's going to be healing either 4 or 0.5 + M.adjustBruteLoss(4.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5 . = TRUE ..() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 7811a7d9567..a9804349945 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -583,7 +583,7 @@ /datum/reagent/toxin/histamine/overdose_process(mob/living/M, delta_time, times_fired) M.adjustOxyLoss(2 * REM * delta_time, FALSE) - M.adjustBruteLoss(2 * REM * delta_time, FALSE, FALSE, BODYPART_ORGANIC) + M.adjustBruteLoss(2 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) M.adjustToxLoss(2 * REM * delta_time, FALSE) ..() . = TRUE diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 4bb98269ae9..722da9e3b1a 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -17,7 +17,7 @@ if(!affecting) to_chat(user, span_warning("The limb is missing!")) return - if(affecting.status != BODYPART_ORGANIC) + if(!IS_ORGANIC_LIMB(affecting)) to_chat(user, span_notice("Medicine won't work on a robotic limb!")) return ..() diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index 807f79f6e48..88f299227a5 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -97,19 +97,18 @@ if(!ishuman(target)) return FALSE var/mob/living/carbon/human/blessed = target - for(var/X in blessed.bodyparts) - var/obj/item/bodypart/bodypart = X - if(bodypart.status == BODYPART_ROBOTIC) + for(var/obj/item/bodypart/bodypart as anything in blessed.bodyparts) + if(!IS_ORGANIC_LIMB(bodypart)) to_chat(chap, span_warning("[GLOB.deity] refuses to heal this metallic taint!")) return TRUE var/heal_amt = 10 - var/list/hurt_limbs = blessed.get_damaged_bodyparts(1, 1, null, BODYPART_ORGANIC) + var/list/hurt_limbs = blessed.get_damaged_bodyparts(1, 1, null, BODYTYPE_ORGANIC) if(hurt_limbs.len) for(var/X in hurt_limbs) var/obj/item/bodypart/affecting = X - if(affecting.heal_damage(heal_amt, heal_amt, null, BODYPART_ORGANIC)) + if(affecting.heal_damage(heal_amt, heal_amt, null, BODYTYPE_ORGANIC)) blessed.update_damage_overlays() blessed.visible_message(span_notice("[chap] heals [blessed] with the power of [GLOB.deity]!")) to_chat(blessed, span_boldnotice("May the power of [GLOB.deity] compel you to be healed!")) @@ -164,7 +163,7 @@ //if we're not targetting a robot part we stop early var/obj/item/bodypart/bodypart = blessed.get_bodypart(chap.zone_selected) - if(bodypart.status != BODYPART_ROBOTIC) + if(!IS_ORGANIC_LIMB(bodypart)) if(!did_we_charge) to_chat(chap, span_warning("[GLOB.deity] scoffs at the idea of healing such fleshy matter!")) else @@ -175,7 +174,7 @@ return TRUE //charge(?) and go - if(bodypart.heal_damage(5,5,null,BODYPART_ROBOTIC)) + if(bodypart.heal_damage(5,5,null,BODYTYPE_ROBOTIC)) blessed.update_damage_overlays() blessed.visible_message(span_notice("[chap] [did_we_charge ? "repairs" : "repairs and charges"] [blessed] with the power of [GLOB.deity]!")) @@ -251,16 +250,16 @@ return FALSE var/mob/living/carbon/human/blessed = blessed_living for(var/obj/item/bodypart/robolimb as anything in blessed.bodyparts) - if(robolimb.status == BODYPART_ROBOTIC) + if(!IS_ORGANIC_LIMB(robolimb)) to_chat(chap, span_warning("[GLOB.deity] refuses to heal this metallic taint!")) return TRUE account.adjust_money(-GREEDY_HEAL_COST) var/heal_amt = 30 - var/list/hurt_limbs = blessed.get_damaged_bodyparts(1, 1, null, BODYPART_ORGANIC) + var/list/hurt_limbs = blessed.get_damaged_bodyparts(1, 1, null, BODYTYPE_ORGANIC) if(hurt_limbs.len) for(var/obj/item/bodypart/affecting as anything in hurt_limbs) - if(affecting.heal_damage(heal_amt, heal_amt, null, BODYPART_ORGANIC)) + if(affecting.heal_damage(heal_amt, heal_amt, null, BODYTYPE_ORGANIC)) blessed.update_damage_overlays() blessed.visible_message(span_notice("[chap] barters a heal for [blessed] from [GLOB.deity]!")) to_chat(blessed, span_boldnotice("May the power of [GLOB.deity] compel you to be healed! Thank you for choosing [GLOB.deity]!")) diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index f648d829134..2738fc89d5c 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -4,7 +4,7 @@ /datum/design/leftarm name = "Left Arm" - id = "leftarm" + id = "l_arm" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 25) build_path = /obj/item/bodypart/l_arm @@ -12,7 +12,7 @@ /datum/design/rightarm name = "Right Arm" - id = "rightarm" + id = "r_arm" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 25) build_path = /obj/item/bodypart/r_arm @@ -20,35 +20,19 @@ /datum/design/leftleg name = "Left Leg" - id = "leftleg" + id = "l_leg" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 25) build_path = /obj/item/bodypart/l_leg - category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL) + category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL, "digitigrade") /datum/design/rightleg name = "Right Leg" - id = "rightleg" + id = "r_leg" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 25) build_path = /obj/item/bodypart/r_leg - category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL) - -/datum/design/digi_leftleg - name = "Digitigrade Left Leg" - id = "digi_leftleg" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 30) - build_path = /obj/item/bodypart/l_leg/digitigrade - category = list(SPECIES_LIZARD) - -/datum/design/digi_rightleg - name = "Digitigrade Right Leg" - id = "digi_rightleg" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 30) - build_path = /obj/item/bodypart/r_leg/digitigrade - category = list(SPECIES_LIZARD) + category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL, "digitigrade") //Non-limb limb designs @@ -256,41 +240,41 @@ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL /obj/item/disk/design_disk/limbs/felinid - name = "Felinid Limb Design Disk" + name = "Felinid Organ Design Disk" limb_designs = list(/datum/design/cat_tail, /datum/design/cat_ears) /datum/design/limb_disk/felinid - name = "Felinid Limb Design Disk" - desc = "Contains designs for felinid bodyparts for the limbgrower - Felinid ears and tail." + name = "Felinid Organ Design Disk" + desc = "Contains designs for felinid organs for the limbgrower - Felinid ears and tail." id = "limbdesign_felinid" build_path = /obj/item/disk/design_disk/limbs/felinid /obj/item/disk/design_disk/limbs/lizard - name = "Lizard Limb Design Disk" - limb_designs = list(/datum/design/lizard_tail, /datum/design/lizard_tongue, /datum/design/digi_leftleg, /datum/design/digi_rightleg) + name = "Lizard Organ Design Disk" + limb_designs = list(/datum/design/lizard_tail, /datum/design/lizard_tongue) /datum/design/limb_disk/lizard - name = "Lizard Limb Design Disk" - desc = "Contains designs for lizard bodyparts for the limbgrower - Lizard tongue, tail, and digitigrade legs." + name = "Lizard Organ Design Disk" + desc = "Contains designs for lizard organs for the limbgrower - Lizard tongue, and tail" id = "limbdesign_lizard" build_path = /obj/item/disk/design_disk/limbs/lizard /obj/item/disk/design_disk/limbs/plasmaman - name = "Plasmaman Limb Design Disk" + name = "Plasmaman Organ Design Disk" limb_designs = list(/datum/design/plasmaman_stomach, /datum/design/plasmaman_liver, /datum/design/plasmaman_lungs, /datum/design/plasmaman_tongue) /datum/design/limb_disk/plasmaman - name = "Plasmaman Limb Design Disk" + name = "Plasmaman Organ Design Disk" desc = "Contains designs for plasmaman organs for the limbgrower - Plasmaman tongue, liver, stomach, and lungs." id = "limbdesign_plasmaman" build_path = /obj/item/disk/design_disk/limbs/plasmaman /obj/item/disk/design_disk/limbs/ethereal - name = "Ethereal Limb Design Disk" + name = "Ethereal Organ Design Disk" limb_designs = list(/datum/design/ethereal_stomach, /datum/design/ethereal_tongue, /datum/design/ethereal_lungs) /datum/design/limb_disk/ethereal - name = "Ethereal Limb Design Disk" + name = "Ethereal Organ Design Disk" desc = "Contains designs for ethereal organs for the limbgrower - Ethereal tongue and stomach." id = "limbdesign_ethereal" build_path = /obj/item/disk/design_disk/limbs/ethereal diff --git a/code/modules/spells/spell_types/shadow_walk.dm b/code/modules/spells/spell_types/shadow_walk.dm index 181dc23ff20..2146fcc45e4 100644 --- a/code/modules/spells/spell_types/shadow_walk.dm +++ b/code/modules/spells/spell_types/shadow_walk.dm @@ -63,7 +63,7 @@ if(!jaunter || jaunter.loc != src) qdel(src) if (light_amount < 0.2 && (!QDELETED(jaunter))) //heal in the dark - jaunter.heal_overall_damage((SHADOW_REGEN_RATE * delta_time), (SHADOW_REGEN_RATE * delta_time), 0, BODYPART_ORGANIC) + jaunter.heal_overall_damage((SHADOW_REGEN_RATE * delta_time), (SHADOW_REGEN_RATE * delta_time), 0, BODYTYPE_ORGANIC) check_light_level() diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 71f39a0b81d..a67eb69a581 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -5,17 +5,35 @@ throwforce = 3 w_class = WEIGHT_CLASS_SMALL icon = 'icons/mob/human_parts.dmi' - icon_state = "" + icon_state = "" //Leave this blank! Bodyparts are built using overlays /// The icon for Organic limbs using greyscale - var/icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC - /// The icon for Robotic limbs - var/icon_robotic = DEFAULT_BODYPART_ICON_ROBOTIC + VAR_PROTECTED/icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC + ///The icon for non-greyscale limbs + VAR_PROTECTED/icon_static = 'icons/mob/human_parts.dmi' + ///The icon for husked limbs + VAR_PROTECTED/icon_husk = 'icons/mob/human_parts.dmi' + ///The type of husk for building an iconstate + var/husk_type = "humanoid" layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor grind_results = list(/datum/reagent/bone_dust = 10, /datum/reagent/liquidgibs = 5) // robotic bodyparts and chests/heads cannot be ground var/mob/living/carbon/owner - var/datum/weakref/original_owner - var/status = BODYPART_ORGANIC - var/needs_processing = FALSE + + ///A bitfield of bodytypes for clothing, surgery, and misc information + var/bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC + ///Defines when a bodypart should not be changed. Example: BP_BLOCK_CHANGE_SPECIES prevents the limb from being overwritten on species gain + var/change_exempt_flags + + var/is_husked = FALSE + ///The ID of a species used to generate the icon. Needs to match the icon_state portion in the limbs file! + var/limb_id = SPECIES_HUMAN + //Defines what sprite the limb should use if it is also sexually dimorphic. + VAR_PROTECTED/limb_gender = "m" + ///Does this limb have a greyscale version? + var/uses_mutcolor = TRUE + ///Is there a sprite difference between male and female? + var/is_dimorphic = FALSE + ///The actual color a limb is drawn as, set by /proc/update_limb() + VAR_PROTECTED/draw_color /// BODY_ZONE_CHEST, BODY_ZONE_L_ARM, etc , used for def_zone var/body_zone @@ -23,8 +41,6 @@ var/aux_layer /// bitflag used to check which clothes cover this bodypart var/body_part - /// Used for alternate legs, useless elsewhere - var/use_digitigrade = NOT_DIGITIGRADE var/list/embedded_objects = list() /// are we a hand? if so, which one! var/held_index = 0 @@ -39,13 +55,19 @@ var/can_be_disabled = FALSE ///Multiplier of the limb's damage that gets applied to the mob var/body_damage_coeff = 1 + ///Multiplier of the limb's stamina damage that gets applied to the mob. Why is this 0.75 by default? Good question! var/stam_damage_coeff = 0.75 var/brutestate = 0 var/burnstate = 0 + ///The current amount of brute damage the limb has var/brute_dam = 0 + ///The current amount of burn damage the limb has var/burn_dam = 0 + ///The current amount of stamina damage the limb has var/stamina_dam = 0 + ///The maximum stamina damage a bodypart can take var/max_stamina_damage = 0 + ///The maximum "physical" damage a bodypart can take. Set by children var/max_damage = 0 ///Gradually increases while burning when at full damage, destroys the limb when at 100 var/cremation_progress = 0 @@ -53,20 +75,17 @@ var/brute_reduction = 0 ///Subtracted to burn damage taken var/burn_reduction = 0 + //Coloring and proper item icon update var/skin_tone = "" - var/body_gender = "" - var/species_id = "" - var/should_draw_gender = FALSE - var/should_draw_greyscale = FALSE var/species_color = "" + ///Limbs need this information as a back-up incase they are generated outside of a carbon (limbgrower) + var/should_draw_greyscale = TRUE + ///An "override" color that can be applied to ANY limb, greyscale or not. var/mutation_color = "" - var/no_update = 0 ///for nonhuman bodypart (e.g. monkey) var/animal_origin - //for all bodyparts - var/part_origin = HUMAN_BODY ///whether it can be dismembered with a weapon. var/dismemberable = 1 @@ -115,15 +134,17 @@ ///A list of all the external organs we've got stored to draw horns, wings and stuff with (special because we are actually in the limbs unlike normal organs :/ ) var/list/obj/item/organ/external/external_organs = list() - /obj/item/bodypart/Initialize(mapload) . = ..() if(can_be_disabled) RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_gain) RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_loss) - if(status != BODYPART_ORGANIC) + if(!IS_ORGANIC_LIMB(src)) grind_results = null + name = "[limb_id] [parse_zone(body_zone)]" + update_icon_dropped() + /obj/item/bodypart/Destroy() if(owner) owner.remove_bodypart(src) @@ -135,8 +156,16 @@ wounds.Cut() return ..() +/obj/item/bodypart/forceMove(atom/destination) //Please. Never forcemove a limb if its's actually in use. This is only for borgs. + SHOULD_CALL_PARENT(TRUE) + + . = ..() + if(isturf(destination)) + update_icon_dropped() /obj/item/bodypart/examine(mob/user) + SHOULD_CALL_PARENT(TRUE) + . = ..() if(brute_dam > DAMAGE_PRECISION) . += span_warning("This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.") @@ -153,10 +182,11 @@ . += span_warning("The flesh on this limb appears badly cooked.") /obj/item/bodypart/blob_act() - take_damage(max_damage) - + receive_damage(max_damage, wound_bonus = CANT_WOUND) /obj/item/bodypart/attack(mob/living/carbon/victim, mob/user) + SHOULD_CALL_PARENT(TRUE) + if(ishuman(victim)) var/mob/living/carbon/human/human_victim = victim if(HAS_TRAIT(victim, TRAIT_LIMBATTACHMENT)) @@ -175,6 +205,8 @@ ..() /obj/item/bodypart/attackby(obj/item/weapon, mob/user, params) + SHOULD_CALL_PARENT(TRUE) + if(weapon.get_sharpness()) add_fingerprint(user) if(!contents.len) @@ -189,16 +221,20 @@ return ..() /obj/item/bodypart/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + SHOULD_CALL_PARENT(TRUE) + ..() - if(status != BODYPART_ROBOTIC) + if(IS_ORGANIC_LIMB(src)) playsound(get_turf(src), 'sound/misc/splort.ogg', 50, TRUE, -1) pixel_x = rand(-3, 3) pixel_y = rand(-3, 3) //empties the bodypart from its organs and other things inside it /obj/item/bodypart/proc/drop_organs(mob/user, violent_removal) + SHOULD_CALL_PARENT(TRUE) + var/turf/bodypart_turf = get_turf(src) - if(status != BODYPART_ROBOTIC) + if(IS_ORGANIC_LIMB(src)) playsound(bodypart_turf, 'sound/misc/splort.ogg', 50, TRUE, -1) seep_gauze(9999) // destroy any existing gauze if any exists for(var/obj/item/organ/bodypart_organ in get_organs()) @@ -208,6 +244,9 @@ ///since organs aren't actually stored in the bodypart themselves while attached to a person, we have to query the owner for what we should have /obj/item/bodypart/proc/get_organs() + SHOULD_CALL_PARENT(TRUE) + RETURN_TYPE(/list) + if(!owner) return FALSE @@ -218,10 +257,11 @@ return bodypart_organs - //Return TRUE to get whatever mob this is in to update health. -/obj/item/bodypart/proc/on_life(delta_time, times_fired, stam_regen) - if(stamina_dam > DAMAGE_PRECISION && stam_regen) //DO NOT update health here, it'll be done in the carbon's life. +/obj/item/bodypart/proc/on_life(delta_time, times_fired) + SHOULD_CALL_PARENT(TRUE) + //DO NOT update health here, it'll be done in the carbon's life. + if(stamina_dam > DAMAGE_PRECISION && owner.stam_regen_start_time <= world.time) heal_damage(0, 0, INFINITY, null, FALSE) . |= BODYPART_LIFE_UPDATE_HEALTH @@ -229,13 +269,14 @@ //Damage will not exceed max_damage using this proc //Cannot apply negative damage /obj/item/bodypart/proc/receive_damage(brute = 0, burn = 0, stamina = 0, blocked = 0, updating_health = TRUE, required_status = null, wound_bonus = 0, bare_wound_bonus = 0, sharpness = NONE, attack_direction = null) + SHOULD_CALL_PARENT(TRUE) + var/hit_percent = (100-blocked)/100 if((!brute && !burn && !stamina) || hit_percent <= 0) return FALSE if(owner && (owner.status_flags & GODMODE)) - return FALSE //godmode - - if(required_status && (status != required_status)) + return FALSE //godmode + if(required_status && !(bodytype & required_status)) return FALSE var/dmg_multi = CONFIG_GET(number/damage_multiplier) * hit_percent @@ -341,178 +382,13 @@ . = TRUE return update_bodypart_damage_state() || . -/// Allows us to roll for and apply a wound without actually dealing damage. Used for aggregate wounding power with pellet clouds -/obj/item/bodypart/proc/painless_wound_roll(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus, sharpness=NONE) - if(!owner || phantom_wounding_dmg <= WOUND_MINIMUM_DAMAGE || wound_bonus == CANT_WOUND) - return - - var/mangled_state = get_mangled_state() - var/bio_state = owner.get_biological_state() - var/easy_dismember = HAS_TRAIT(owner, TRAIT_EASYDISMEMBER) // if we have easydismember, we don't reduce damage when redirecting damage to different types (slashing weapons on mangled/skinless limbs attack at 100% instead of 50%) - - if(wounding_type == WOUND_BLUNT && sharpness) - if(sharpness & SHARP_EDGED) - wounding_type = WOUND_SLASH - else if (sharpness & SHARP_POINTY) - wounding_type = WOUND_PIERCE - - //Handling for bone only/flesh only(none right now)/flesh and bone targets - switch(bio_state) - // if we're bone only, all cutting attacks go straight to the bone - if(BIO_JUST_BONE) - if(wounding_type == WOUND_SLASH) - wounding_type = WOUND_BLUNT - phantom_wounding_dmg *= (easy_dismember ? 1 : 0.6) - else if(wounding_type == WOUND_PIERCE) - wounding_type = WOUND_BLUNT - phantom_wounding_dmg *= (easy_dismember ? 1 : 0.75) - if((mangled_state & BODYPART_MANGLED_BONE) && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus)) - return - // note that there's no handling for BIO_JUST_FLESH since we don't have any that are that right now (slimepeople maybe someday) - // standard humanoids - if(BIO_FLESH_BONE) - // if we've already mangled the skin (critical slash or piercing wound), then the bone is exposed, and we can damage it with sharp weapons at a reduced rate - // So a big sharp weapon is still all you need to destroy a limb - if(mangled_state == BODYPART_MANGLED_FLESH && sharpness) - playsound(src, "sound/effects/wounds/crackandbleed.ogg", 100) - if(wounding_type == WOUND_SLASH && !easy_dismember) - phantom_wounding_dmg *= 0.6 // edged weapons pass along 60% of their wounding damage to the bone since the power is spread out over a larger area - if(wounding_type == WOUND_PIERCE && !easy_dismember) - phantom_wounding_dmg *= 0.75 // piercing weapons pass along 75% of their wounding damage to the bone since it's more concentrated - wounding_type = WOUND_BLUNT - else if(mangled_state == BODYPART_MANGLED_BOTH && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus)) - return - - check_wounding(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus) - -/** - * check_wounding() is where we handle rolling for, selecting, and applying a wound if we meet the criteria - * - * We generate a "score" for how woundable the attack was based on the damage and other factors discussed in [/obj/item/bodypart/proc/check_woundings_mods], then go down the list from most severe to least severe wounds in that category. - * We can promote a wound from a lesser to a higher severity this way, but we give up if we have a wound of the given type and fail to roll a higher severity, so no sidegrades/downgrades - * - * Arguments: - * * woundtype- Either WOUND_BLUNT, WOUND_SLASH, WOUND_PIERCE, or WOUND_BURN based on the attack type. - * * damage- How much damage is tied to this attack, since wounding potential scales with damage in an attack (see: WOUND_DAMAGE_EXPONENT) - * * wound_bonus- The wound_bonus of an attack - * * bare_wound_bonus- The bare_wound_bonus of an attack - */ -/obj/item/bodypart/proc/check_wounding(woundtype, damage, wound_bonus, bare_wound_bonus, attack_direction) - if(HAS_TRAIT(owner, TRAIT_NEVER_WOUNDED)) - return - - // note that these are fed into an exponent, so these are magnified - if(HAS_TRAIT(owner, TRAIT_EASILY_WOUNDED)) - damage *= 1.5 - else - damage = min(damage, WOUND_MAX_CONSIDERED_DAMAGE) - - if(HAS_TRAIT(owner,TRAIT_HARDLY_WOUNDED)) - damage *= 0.85 - - if(HAS_TRAIT(owner, TRAIT_EASYDISMEMBER)) - damage *= 1.1 - - var/base_roll = rand(1, round(damage ** WOUND_DAMAGE_EXPONENT)) - var/injury_roll = base_roll - injury_roll += check_woundings_mods(woundtype, damage, wound_bonus, bare_wound_bonus) - var/list/wounds_checking = GLOB.global_wound_types[woundtype] - - if(injury_roll > WOUND_DISMEMBER_OUTRIGHT_THRESH && prob(get_damage() / max_damage * 100)) - var/datum/wound/loss/dismembering = new - dismembering.apply_dismember(src, woundtype, outright = TRUE, attack_direction = attack_direction) - return - - // quick re-check to see if bare_wound_bonus applies, for the benefit of log_wound(), see about getting the check from check_woundings_mods() somehow - if(ishuman(owner)) - var/mob/living/carbon/human/human_wearer = owner - var/list/clothing = human_wearer.clothingonpart(src) - for(var/obj/item/clothing/clothes_check as anything in clothing) - // unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary - if(clothes_check.armor.getRating(WOUND)) - bare_wound_bonus = 0 - break - - //cycle through the wounds of the relevant category from the most severe down - for(var/datum/wound/possible_wound as anything in wounds_checking) - var/datum/wound/replaced_wound - for(var/datum/wound/existing_wound as anything in wounds) - if(existing_wound.type in wounds_checking) - if(existing_wound.severity >= initial(possible_wound.severity)) - return - else - replaced_wound = existing_wound - - if(initial(possible_wound.threshold_minimum) < injury_roll) - var/datum/wound/new_wound - if(replaced_wound) - new_wound = replaced_wound.replace_wound(possible_wound, attack_direction = attack_direction) - else - new_wound = new possible_wound - new_wound.apply_wound(src, attack_direction = attack_direction) - log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned - return new_wound - -// try forcing a specific wound, but only if there isn't already a wound of that severity or greater for that type on this bodypart -/obj/item/bodypart/proc/force_wound_upwards(specific_woundtype, smited = FALSE) - var/datum/wound/potential_wound = specific_woundtype - for(var/datum/wound/existing_wound as anything in wounds) - if(existing_wound.wound_type == initial(potential_wound.wound_type)) - if(existing_wound.severity < initial(potential_wound.severity)) // we only try if the existing one is inferior to the one we're trying to force - existing_wound.replace_wound(potential_wound, smited) - return - - var/datum/wound/new_wound = new potential_wound - new_wound.apply_wound(src, smited = smited) - -/** - * check_wounding_mods() is where we handle the various modifiers of a wound roll - * - * A short list of things we consider: any armor a human target may be wearing, and if they have no wound armor on the limb, if we have a bare_wound_bonus to apply, plus the plain wound_bonus - * We also flick through all of the wounds we currently have on this limb and add their threshold penalties, so that having lots of bad wounds makes you more liable to get hurt worse - * Lastly, we add the inherent wound_resistance variable the bodypart has (heads and chests are slightly harder to wound), and a small bonus if the limb is already disabled - * - * Arguments: - * * It's the same ones on [/obj/item/bodypart/proc/receive_damage] - */ -/obj/item/bodypart/proc/check_woundings_mods(wounding_type, damage, wound_bonus, bare_wound_bonus) - var/armor_ablation = 0 - var/injury_mod = 0 - - if(owner && ishuman(owner)) - var/mob/living/carbon/human/human_owner = owner - var/list/clothing = human_owner.clothingonpart(src) - for(var/obj/item/clothing/clothes as anything in clothing) - // unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary - armor_ablation += clothes.armor.getRating(WOUND) - if(wounding_type == WOUND_SLASH) - clothes.take_damage_zone(body_zone, damage, BRUTE) - else if(wounding_type == WOUND_BURN && damage >= 10) // lazy way to block freezing from shredding clothes without adding another var onto apply_damage() - clothes.take_damage_zone(body_zone, damage, BURN) - - if(!armor_ablation) - injury_mod += bare_wound_bonus - - injury_mod -= armor_ablation - injury_mod += wound_bonus - - for(var/datum/wound/wound as anything in wounds) - injury_mod += wound.threshold_penalty - - var/part_mod = -wound_resistance - if(get_damage(TRUE) >= max_damage) - part_mod += disabled_wound_penalty - - injury_mod += part_mod - - return injury_mod - //Heals brute and burn damage for the organ. Returns 1 if the damage-icon states changed at all. //Damage cannot go below zero. //Cannot remove negative damage (i.e. apply damage) /obj/item/bodypart/proc/heal_damage(brute, burn, stamina, required_status, updating_health = TRUE) + SHOULD_CALL_PARENT(TRUE) - if(required_status && status != required_status) //So we can only heal certain kinds of limbs, ie robotic vs organic. + if(required_status && !(bodytype & required_status)) //So we can only heal certain kinds of limbs, ie robotic vs organic. return if(brute) @@ -533,6 +409,8 @@ ///Proc to hook behavior associated to the change of the brute_dam variable's value. /obj/item/bodypart/proc/set_brute_dam(new_value) + PROTECTED_PROC(TRUE) + if(brute_dam == new_value) return . = brute_dam @@ -541,6 +419,8 @@ ///Proc to hook behavior associated to the change of the burn_dam variable's value. /obj/item/bodypart/proc/set_burn_dam(new_value) + PROTECTED_PROC(TRUE) + if(burn_dam == new_value) return . = burn_dam @@ -549,15 +429,12 @@ ///Proc to hook behavior associated to the change of the stamina_dam variable's value. /obj/item/bodypart/proc/set_stamina_dam(new_value) + PROTECTED_PROC(TRUE) + if(stamina_dam == new_value) return . = stamina_dam stamina_dam = new_value - if(stamina_dam > DAMAGE_PRECISION) - needs_processing = TRUE - else - needs_processing = FALSE - //Returns total damage. /obj/item/bodypart/proc/get_damage(include_stamina = FALSE) @@ -566,9 +443,10 @@ total = max(total, stamina_dam) return total - //Checks disabled status thresholds /obj/item/bodypart/proc/update_disabled() + SHOULD_CALL_PARENT(TRUE) + if(!owner) return @@ -609,6 +487,9 @@ ///Proc to change the value of the `disabled` variable and react to the event of its change. /obj/item/bodypart/proc/set_disabled(new_disabled) + SHOULD_CALL_PARENT(TRUE) + PROTECTED_PROC(TRUE) + if(bodypart_disabled == new_disabled) return . = bodypart_disabled @@ -622,6 +503,8 @@ ///Proc to change the value of the `owner` variable and react to the event of its change. /obj/item/bodypart/proc/set_owner(new_owner) + SHOULD_CALL_PARENT(TRUE) + if(owner == new_owner) return FALSE //`null` is a valid option, so we need to use a num var to make it clear no change was made. . = owner @@ -651,6 +534,9 @@ ///Proc to change the value of the `can_be_disabled` variable and react to the event of its change. /obj/item/bodypart/proc/set_can_be_disabled(new_can_be_disabled) + PROTECTED_PROC(TRUE) + SHOULD_CALL_PARENT(TRUE) + if(can_be_disabled == new_can_be_disabled) return . = can_be_disabled @@ -673,32 +559,42 @@ ///Called when TRAIT_PARALYSIS is added to the limb. /obj/item/bodypart/proc/on_paralysis_trait_gain(obj/item/bodypart/source) + PROTECTED_PROC(TRUE) SIGNAL_HANDLER + if(can_be_disabled) set_disabled(TRUE) ///Called when TRAIT_PARALYSIS is removed from the limb. /obj/item/bodypart/proc/on_paralysis_trait_loss(obj/item/bodypart/source) + PROTECTED_PROC(TRUE) SIGNAL_HANDLER + if(can_be_disabled) update_disabled() ///Called when TRAIT_NOLIMBDISABLE is added to the owner. /obj/item/bodypart/proc/on_owner_nolimbdisable_trait_gain(mob/living/carbon/source) + PROTECTED_PROC(TRUE) SIGNAL_HANDLER + set_can_be_disabled(FALSE) ///Called when TRAIT_NOLIMBDISABLE is removed from the owner. /obj/item/bodypart/proc/on_owner_nolimbdisable_trait_loss(mob/living/carbon/source) + PROTECTED_PROC(TRUE) SIGNAL_HANDLER + set_can_be_disabled(initial(can_be_disabled)) //Updates an organ's brute/burn states for use by update_damage_overlays() //Returns 1 if we need to update overlays. 0 otherwise. /obj/item/bodypart/proc/update_bodypart_damage_state() + SHOULD_CALL_PARENT(TRUE) + var/tbrute = round( (brute_dam/max_damage)*3, 1 ) var/tburn = round( (burn_dam/max_damage)*3, 1 ) if((tbrute != brutestate) || (tburn != burnstate)) @@ -707,124 +603,86 @@ return TRUE return FALSE -//Change organ status -/obj/item/bodypart/proc/change_bodypart_status(new_limb_status, heal_limb, change_icon_to_default) - status = new_limb_status - if(heal_limb) - burn_dam = 0 - brute_dam = 0 - brutestate = 0 - burnstate = 0 - - if(change_icon_to_default) - if(status == BODYPART_ORGANIC) - icon = icon_greyscale - else if(status == BODYPART_ROBOTIC) - icon = icon_robotic - - if(owner) - owner.updatehealth() - owner.update_body() //if our head becomes robotic, we remove the lizard horns and human hair. - owner.update_hair() - owner.update_damage_overlays() - -/obj/item/bodypart/proc/is_organic_limb() - return (status == BODYPART_ORGANIC) - //we inform the bodypart of the changes that happened to the owner, or give it the informations from a source mob. -/obj/item/bodypart/proc/update_limb(dropping_limb, mob/living/carbon/source) - var/mob/living/carbon/limb_owner - if(source) - limb_owner = source - if(!original_owner) - original_owner = WEAKREF(source) - else - limb_owner = owner - if(original_owner && !IS_WEAKREF_OF(owner, original_owner)) //Foreign limb - no_update = TRUE - else - no_update = FALSE +//set is_creating to true if you want to change the appearance of the limb outside of mutation changes or forced changes. +/obj/item/bodypart/proc/update_limb(dropping_limb = FALSE, is_creating = FALSE) + SHOULD_CALL_PARENT(TRUE) - if(HAS_TRAIT(limb_owner, TRAIT_HUSK) && is_organic_limb()) - species_id = "husk" //overrides species_id + if(HAS_TRAIT(owner, TRAIT_HUSK) && IS_ORGANIC_LIMB(src)) dmg_overlay_type = "" //no damage overlay shown when husked - should_draw_gender = FALSE - should_draw_greyscale = FALSE - no_update = TRUE + is_husked = TRUE + else + dmg_overlay_type = initial(dmg_overlay_type) + is_husked = FALSE - if(HAS_TRAIT(src, TRAIT_PLASMABURNT) && is_organic_limb()) - species_id = SPECIES_PLASMAMAN - dmg_overlay_type = "" - should_draw_gender = FALSE - should_draw_greyscale = FALSE - no_update = TRUE + if(!dropping_limb && owner.dna?.check_mutation(/datum/mutation/human/hulk)) //Please remove hulk from the game. I beg you. + mutation_color = "#00aa00" + else + mutation_color = null - if(HAS_TRAIT(limb_owner, TRAIT_INVISIBLE_MAN) && is_organic_limb()) - species_id = "invisible" //overrides species_id - dmg_overlay_type = "" //no damage overlay shown when invisible since the wounds themselves are invisible. - should_draw_gender = FALSE - should_draw_greyscale = FALSE - no_update = TRUE + if(mutation_color) + draw_color = mutation_color + else if(should_draw_greyscale) + draw_color = (species_color) || (skin_tone && skintone2hex(skin_tone)) + else + draw_color = null - if(no_update) + if(!is_creating) return - if(!animal_origin) - var/mob/living/carbon/human/human_owner = limb_owner - should_draw_greyscale = FALSE + if(!animal_origin && ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner var/datum/species/owner_species = human_owner.dna.species - species_id = owner_species.limbs_id species_flags_list = human_owner.dna.species.species_traits + limb_gender = (human_owner.physique == MALE) ? "m" : "f" if(owner_species.use_skintones) skin_tone = human_owner.skin_tone - should_draw_greyscale = TRUE else skin_tone = "" - body_gender = human_owner.body_type - should_draw_gender = owner_species.sexes - - if((MUTCOLORS in owner_species.species_traits) || (DYNCOLORS in owner_species.species_traits)) + if(((MUTCOLORS in owner_species.species_traits) || (DYNCOLORS in owner_species.species_traits)) && uses_mutcolor) //Ethereal code. Motherfuckers. if(owner_species.fixed_mut_color) species_color = owner_species.fixed_mut_color else species_color = human_owner.dna.features["mcolor"] - should_draw_greyscale = TRUE else - species_color = "" + species_color = null - if(!dropping_limb && human_owner.dna.check_mutation(/datum/mutation/human/hulk)) - mutation_color = "#00aa00" - else - mutation_color = "" + draw_color = mutation_color + if(should_draw_greyscale) //Should the limb be colored? + draw_color ||= (species_color) || (skin_tone && skintone2hex(skin_tone)) dmg_overlay_type = owner_species.damage_overlay_type else if(animal_origin == MONKEY_BODYPART) //currently monkeys are the only non human mob to have damage overlays. dmg_overlay_type = animal_origin - if(status == BODYPART_ROBOTIC) + if(!IS_ORGANIC_LIMB(src)) dmg_overlay_type = "robotic" - if(dropping_limb) - no_update = TRUE //when attached, the limb won't be affected by the appearance changes of its mob owner. + return TRUE //to update the bodypart's icon when not attached to a mob /obj/item/bodypart/proc/update_icon_dropped() + SHOULD_CALL_PARENT(TRUE) + cut_overlays() var/list/standing = get_limb_icon(TRUE) if(!standing.len) icon_state = initial(icon_state)//no overlays found, we default back to initial icon. return - for(var/image/img in standing) + for(var/image/img as anything in standing) img.pixel_x = px_x img.pixel_y = px_y add_overlay(standing) -//Gives you a proper icon appearance for the dismembered limb -/obj/item/bodypart/proc/get_limb_icon(dropped, draw_external_organs) +///Generates an /image for the limb to be used as an overlay +/obj/item/bodypart/proc/get_limb_icon(dropped) + SHOULD_CALL_PARENT(TRUE) + RETURN_TYPE(/list) + icon_state = "" //to erase the default sprite, we're building the visual aspects of the bodypart through overlays alone. . = list() @@ -843,9 +701,9 @@ . += limb if(animal_origin) - if(is_organic_limb()) + if(IS_ORGANIC_LIMB(src)) limb.icon = 'icons/mob/animal_parts.dmi' - if(species_id == "husk") + if(limb_id == "husk") limb.icon_state = "[animal_origin]_husk_[body_zone]" else limb.icon_state = "[animal_origin]_[body_zone]" @@ -859,71 +717,43 @@ limb.overlays += limb_em_block return - var/icon_gender = (body_gender == FEMALE) ? "f" : "m" //gender of the icon, if applicable - - if((body_zone != BODY_ZONE_HEAD && body_zone != BODY_ZONE_CHEST)) - should_draw_gender = FALSE - - var/draw_color - - if(!is_organic_limb()) - limb.icon = icon - limb.icon_state = "[body_zone]" //Inorganic limbs are agender - - if(blocks_emissive) - var/mutable_appearance/limb_em_block = emissive_blocker(limb.icon, limb.icon_state, alpha = limb.alpha) - limb_em_block.dir = image_dir - limb.overlays += limb_em_block - - if(aux_zone) - aux = image(limb.icon, "[aux_zone]", -aux_layer, image_dir) - . += aux - - if(blocks_emissive) - var/mutable_appearance/aux_em_block = emissive_blocker(aux.icon, aux.icon_state, alpha = aux.alpha) - aux_em_block.dir = image_dir - aux.overlays += aux_em_block + ////This is the MEAT of limb icon code + limb.icon = icon_greyscale + if(!should_draw_greyscale || !icon_greyscale) + limb.icon = icon_static + if(is_dimorphic) //Does this type of limb have sexual dimorphism? + limb.icon_state = "[limb_id]_[body_zone]_[limb_gender]" else - if(should_draw_greyscale) - limb.icon = icon_greyscale - if(should_draw_gender) - limb.icon_state = "[species_id]_[body_zone]_[icon_gender]" - else if(use_digitigrade) - limb.icon_state = "digitigrade_[use_digitigrade]_[body_zone]" - else - limb.icon_state = "[species_id]_[body_zone]" - else - limb.icon = 'icons/mob/human_parts.dmi' - if(should_draw_gender) - limb.icon_state = "[species_id]_[body_zone]_[icon_gender]" - else - limb.icon_state = "[species_id]_[body_zone]" + limb.icon_state = "[limb_id]_[body_zone]" + + icon_exists(limb.icon, limb.icon_state, TRUE) //Prints a stack trace on the first failure of a given iconstate. + + if(aux_zone) //Hand shit + aux = image(limb.icon, "[limb_id]_[aux_zone]", -aux_layer, image_dir) + . += aux + + draw_color = mutation_color + if(should_draw_greyscale) //Should the limb be colored outside of a forced color? + draw_color ||= (species_color) || (skin_tone && skintone2hex(skin_tone)) + + if(draw_color) + limb.color = "[draw_color]" + if(aux_zone) + aux.color = "[draw_color]" + + //EMISSIVE CODE START + if(blocks_emissive) + var/mutable_appearance/limb_em_block = emissive_blocker(limb.icon, limb.icon_state, alpha = limb.alpha) + limb_em_block.dir = image_dir + limb.overlays += limb_em_block if(aux_zone) - aux = image(limb.icon, "[species_id]_[aux_zone]", -aux_layer, image_dir) - . += aux - - if(should_draw_greyscale) - draw_color = mutation_color || species_color || (skin_tone && skintone2hex(skin_tone)) - if(draw_color) - limb.color = draw_color - if(aux_zone) - aux.color = draw_color - - if(blocks_emissive) - var/mutable_appearance/limb_em_block = emissive_blocker(limb.icon, limb.icon_state, alpha = limb.alpha) - limb_em_block.dir = image_dir - limb.overlays += limb_em_block - - if(aux_zone) - var/mutable_appearance/aux_em_block = emissive_blocker(aux.icon, aux.icon_state, alpha = aux.alpha) - aux_em_block.dir = image_dir - aux.overlays += aux_em_block - - if(!draw_external_organs) - return + var/mutable_appearance/aux_em_block = emissive_blocker(aux.icon, aux.icon_state, alpha = aux.alpha) + aux_em_block.dir = image_dir + aux.overlays += aux_em_block + //EMISSIVE CODE END //Draw external organs like horns and frills for(var/obj/item/organ/external/external_organ in external_organs) if(!dropped && !external_organ.can_draw_on_bodypart(owner)) @@ -935,41 +765,13 @@ // Invert the colour of the pod hair's flower draw_color = rgb(255 - rgb_list[1], 255 - rgb_list[2], 255 - rgb_list[3]) if(external_organ.layers & external_layer) - external_organ.get_overlays(., image_dir, external_organ.bitflag_to_layer(external_layer), icon_gender, draw_color) + external_organ.get_overlays(., image_dir, external_organ.bitflag_to_layer(external_layer), limb_gender, draw_color) /obj/item/bodypart/deconstruct(disassembled = TRUE) + SHOULD_CALL_PARENT(TRUE) + drop_organs() - qdel(src) - -/// Get whatever wound of the given type is currently attached to this limb, if any -/obj/item/bodypart/proc/get_wound_type(checking_type) - if(isnull(wounds)) - return - - for(var/wound in wounds) - if(istype(wound, checking_type)) - return wound - -/** - * update_wounds() is called whenever a wound is gained or lost on this bodypart, as well as if there's a change of some kind on a bone wound possibly changing disabled status - * - * Covers tabulating the damage multipliers we have from wounds (burn specifically), as well as deleting our gauze wrapping if we don't have any wounds that can use bandaging - * - * Arguments: - * * replaced- If true, this is being called from the remove_wound() of a wound that's being replaced, so the bandage that already existed is still relevant, but the new wound hasn't been added yet - */ -/obj/item/bodypart/proc/update_wounds(replaced = FALSE) - var/dam_mul = 1 //initial(wound_damage_multiplier) - - // we can (normally) only have one wound per type, but remember there's multiple types (smites like :B:loodless can generate multiple cuts on a limb) - for(var/datum/wound/iter_wound as anything in wounds) - dam_mul *= iter_wound.damage_mulitplier_penalty - - if(!LAZYLEN(wounds) && current_gauze && !replaced) // no more wounds = no need for the gauze anymore - owner.visible_message(span_notice("\The [current_gauze.name] on [owner]'s [name] falls away."), span_notice("The [current_gauze.name] on your [name] falls away.")) - QDEL_NULL(current_gauze) - - wound_damage_multiplier = dam_mul + return ..() /** * Calculates how much blood this limb is losing per life tick @@ -978,9 +780,11 @@ * * ignore_modifiers - If TRUE, ignore the bleed reduction for laying down and grabbing your limb */ /obj/item/bodypart/proc/get_part_bleed_rate(ignore_modifiers = FALSE) + SHOULD_NOT_OVERRIDE(TRUE) + if(HAS_TRAIT(owner, TRAIT_NOBLEED)) return - if(status != BODYPART_ORGANIC) // maybe in the future we can bleed oil from aug parts, but not now + if(!IS_ORGANIC_LIMB(src))// maybe in the future we can bleed oil from aug parts, but not now return var/bleed_rate = 0 @@ -1015,7 +819,7 @@ /obj/item/bodypart/proc/update_part_wound_overlay() if(!owner) return FALSE - if(HAS_TRAIT(owner, TRAIT_NOBLEED) || status != BODYPART_ORGANIC) + if(HAS_TRAIT(owner, TRAIT_NOBLEED) || !IS_ORGANIC_LIMB(src) || (NOBLOOD in species_flags_list)) if(bleed_overlay_icon) bleed_overlay_icon = null owner.update_wound_overlays() @@ -1091,8 +895,8 @@ ///Proc to turn bodypart into another. /obj/item/bodypart/proc/change_bodypart(obj/item/bodypart/new_type) + RETURN_TYPE(/obj/item/bodypart) + var/mob/living/carbon/our_owner = owner //dropping nulls the limb - drop_limb(TRUE) var/obj/item/bodypart/new_part = new new_type() - new_part.attach_limb(our_owner, TRUE) - qdel(src) + new_part.replace_limb(our_owner, TRUE) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 0b18f8de895..4671c9b8d22 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -129,6 +129,7 @@ organ.transfer_to_limb(src, phantom_owner) update_icon_dropped() + synchronize_bodytypes(phantom_owner) phantom_owner.update_health_hud() //update the healthdoll phantom_owner.update_body() phantom_owner.update_hair() @@ -292,11 +293,6 @@ if(pill) pill.forceMove(src) - //Make sure de-zombification happens before organ removal instead of during it - var/obj/item/organ/zombie_infection/ooze = owner.getorganslot(ORGAN_SLOT_ZOMBIE) - if(istype(ooze)) - ooze.transfer_to_limb(src, owner) - name = "[owner.real_name]'s head" ..() @@ -304,11 +300,13 @@ /obj/item/bodypart/proc/replace_limb(mob/living/carbon/limb_owner, special) if(!istype(limb_owner)) return - var/obj/item/bodypart/limb = limb_owner.get_bodypart(body_zone) //needs to happen before attach because multiple limbs in same zone breaks helpers - if(!attach_limb(limb_owner, special))//we can attach this limb and drop the old after because of our robust bodyparts system. you know, just for a sec. - return - if(limb) - limb.drop_limb(1) + var/obj/item/bodypart/old_limb = limb_owner.get_bodypart(body_zone) + if(old_limb) + old_limb.drop_limb(TRUE) + + . = attach_limb(limb_owner, special) + if(!.) //If it failed to replace, re-attach their old limb as if nothing happened. + old_limb.attach_limb(limb_owner, TRUE) /obj/item/bodypart/head/replace_limb(mob/living/carbon/head_owner, special) if(!istype(head_owner)) @@ -322,7 +320,11 @@ /obj/item/bodypart/proc/attach_limb(mob/living/carbon/new_limb_owner, special) if(SEND_SIGNAL(new_limb_owner, COMSIG_CARBON_ATTACH_LIMB, src, special) & COMPONENT_NO_ATTACH) return FALSE - . = TRUE + + var/obj/item/bodypart/chest/mob_chest = new_limb_owner.get_bodypart(BODY_ZONE_CHEST) + if(mob_chest && !(mob_chest.acceptable_bodytype & bodytype) && !special) + return FALSE + moveToNullspace() set_owner(new_limb_owner) new_limb_owner.add_bodypart(src) @@ -365,20 +367,14 @@ if(can_be_disabled) update_disabled() + synchronize_bodytypes(new_limb_owner) new_limb_owner.updatehealth() new_limb_owner.update_body() - new_limb_owner.update_hair() new_limb_owner.update_damage_overlays() - + return TRUE /obj/item/bodypart/head/attach_limb(mob/living/carbon/new_head_owner, special = FALSE, abort = FALSE) // These are stored before calling super. This is so that if the head is from a different body, it persists its appearance. - var/hair_color = src.hair_color - var/hairstyle = src.hairstyle - var/facial_hair_color = src.facial_hair_color - var/facial_hairstyle = src.facial_hairstyle - var/lip_style = src.lip_style - var/lip_color = src.lip_color var/real_name = src.real_name . = ..() @@ -401,17 +397,9 @@ if(eyes) eyes = null - if(ishuman(new_head_owner)) - var/mob/living/carbon/human/human_head_owner = new_head_owner - human_head_owner.hair_color = hair_color - human_head_owner.hairstyle = hairstyle - human_head_owner.facial_hair_color = facial_hair_color - human_head_owner.facial_hairstyle = facial_hairstyle - human_head_owner.update_lips(lip_style, lip_color, stored_lipstick_trait) if(real_name) new_head_owner.real_name = real_name real_name = "" - name = initial(name) //Handle dental implants for(var/obj/item/reagent_containers/pill/pill in src) @@ -422,41 +410,57 @@ new_head_owner.updatehealth() new_head_owner.update_body() - new_head_owner.update_hair() new_head_owner.update_damage_overlays() +///Makes sure that the owner's bodytype flags match the flags of all of it's parts. +/obj/item/bodypart/proc/synchronize_bodytypes(mob/living/carbon/carbon_owner) + if(!carbon_owner.dna.species) + return + var/all_limb_flags + for(var/obj/item/bodypart/limb as anything in carbon_owner.bodyparts) + all_limb_flags = all_limb_flags | limb.bodytype + + carbon_owner.dna.species.bodytype = all_limb_flags //Regenerates all limbs. Returns amount of limbs regenerated -/mob/living/proc/regenerate_limbs(noheal = FALSE, list/excluded_zones = list()) - SEND_SIGNAL(src, COMSIG_LIVING_REGENERATE_LIMBS, noheal, excluded_zones) +/mob/living/proc/regenerate_limbs(list/excluded_zones = list()) + SEND_SIGNAL(src, COMSIG_LIVING_REGENERATE_LIMBS, excluded_zones) -/mob/living/carbon/regenerate_limbs(noheal = FALSE, list/excluded_zones = list()) - . = ..() +/mob/living/carbon/regenerate_limbs(list/excluded_zones = list()) + SEND_SIGNAL(src, COMSIG_LIVING_REGENERATE_LIMBS, excluded_zones) var/list/zone_list = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) if(length(excluded_zones)) zone_list -= excluded_zones for(var/limb_zone in zone_list) - . += regenerate_limb(limb_zone, noheal) + regenerate_limb(limb_zone) -/mob/living/proc/regenerate_limb(limb_zone, noheal) +/mob/living/proc/regenerate_limb(limb_zone) return -/mob/living/carbon/regenerate_limb(limb_zone, noheal) +/mob/living/carbon/regenerate_limb(limb_zone) var/obj/item/bodypart/limb if(get_bodypart(limb_zone)) return FALSE limb = newBodyPart(limb_zone, 0, 0) if(limb) - if(!noheal) - limb.set_brute_dam(0) - limb.set_burn_dam(0) - limb.brutestate = 0 - limb.burnstate = 0 - if(!limb.attach_limb(src, 1)) qdel(limb) return FALSE + limb.update_limb(is_creating = TRUE) var/datum/scar/scaries = new var/datum/wound/loss/phantom_loss = new // stolen valor, really scaries.generate(limb, phantom_loss) + + //Copied from /datum/species/proc/on_species_gain() + for(var/obj/item/organ/external/organ_path as anything in dna.species.external_organs) + //Load a persons preferences from DNA + var/zone = initial(organ_path.zone) + if(zone != limb_zone) + continue + var/feature_key_name = dna.features[initial(organ_path.feature_key)] + var/obj/item/organ/external/new_organ = SSwardrobe.provide_type(organ_path) + new_organ.set_sprite(feature_key_name) + new_organ.Insert(src) + + update_body_parts() return TRUE diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 24ea1fd7f40..b2f5dfd7018 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -17,6 +17,7 @@ disabled_wound_penalty = 25 scars_covered_by_clothes = FALSE grind_results = null + is_dimorphic = TRUE var/mob/living/brain/brainmob //The current occupant. var/obj/item/organ/brain/brain //The brain organ @@ -29,19 +30,47 @@ //Limb appearance info: var/real_name = "" //Replacement name - //Hair colour and style + ///Hair color source + var/hair_color_source = null + ///Hair colour and style var/hair_color = "#000000" - var/hairstyle = "Bald" + ///An override color that can be cleared later. + var/override_hair_color = null + ///An override that cannot be cleared under any circumstances + var/fixed_hair_color = null + + var/hair_style = "Bald" var/hair_alpha = 255 + var/hair_gradient_style = null + var/hair_gradient_color = null //Facial hair colour and style var/facial_hair_color = "#000000" var/facial_hairstyle = "Shaved" - //Eye Colouring + var/facial_hair_gradient_style = null + var/facial_hair_gradient_color = null + ///Is the hair currently hidden by something? + var/hair_hidden + ///Is the facial hair currently hidden by something? + var/facial_hair_hidden + ///Draw this head as "debrained" + VAR_PROTECTED/show_debrained = FALSE + + var/lip_style var/lip_color = "white" var/stored_lipstick_trait + ///The image for hair + var/mutable_appearance/hair_overlay + ///The image for hair gradient + var/mutable_appearance/hair_gradient_overlay + ///The image for face hair + var/mutable_appearance/facial_overlay + ///The image for facial hair gradient + var/mutable_appearance/facial_gradient_overlay + + /obj/item/bodypart/head/Destroy() @@ -72,7 +101,7 @@ /obj/item/bodypart/head/examine(mob/user) . = ..() - if(status == BODYPART_ORGANIC && show_organs_on_examine) + if(IS_ORGANIC_LIMB(src) && show_organs_on_examine) if(!brain) . += span_info("The brain has been removed from [src].") else if(brain.suicided || brainmob?.suiciding) @@ -106,8 +135,6 @@ /obj/item/bodypart/head/drop_organs(mob/user, violent_removal) var/turf/head_turf = get_turf(src) - if(status != BODYPART_ROBOTIC) - playsound(head_turf, 'sound/misc/splort.ogg', 50, TRUE, -1) for(var/obj/item/head_item in src) if(head_item == brain) if(user) @@ -136,86 +163,139 @@ ears = null tongue = null -/obj/item/bodypart/head/update_limb(dropping_limb, mob/living/carbon/source) - var/mob/living/carbon/head_owner - if(source) - head_owner = source - else - head_owner = owner + return ..() - real_name = head_owner.real_name - if(HAS_TRAIT(head_owner, TRAIT_HUSK)) +#define SET_OVERLAY_VALUE(X,Y,Z) if(X) X.Y = Z +/obj/item/bodypart/head/update_limb(dropping_limb, is_creating) + . = ..() + + real_name = owner.real_name + if(HAS_TRAIT(owner, TRAIT_HUSK)) real_name = "Unknown" - hairstyle = "Bald" + hair_style = "Bald" facial_hairstyle = "Shaved" lip_style = null stored_lipstick_trait = null - else if(!animal_origin) - var/mob/living/carbon/human/human_head_owner = head_owner + else if(!animal_origin && ishuman(owner)) + + var/mob/living/carbon/human/human_head_owner = owner var/datum/species/owner_species = human_head_owner.dna.species - //Facial hair - if(human_head_owner.facial_hairstyle && (FACEHAIR in owner_species.species_traits)) - facial_hairstyle = human_head_owner.facial_hairstyle - if(owner_species.hair_color) - if(owner_species.hair_color == "mutcolor") - facial_hair_color = human_head_owner.dna.features["mcolor"] - else if(hair_color == "fixedmutcolor") - facial_hair_color = owner_species.fixed_mut_color - else - facial_hair_color = owner_species.hair_color - else - facial_hair_color = human_head_owner.facial_hair_color - hair_alpha = owner_species.hair_alpha - else - facial_hairstyle = "Shaved" - facial_hair_color = "#000000" - hair_alpha = 255 - //Hair - if(human_head_owner.hairstyle && (HAIR in owner_species.species_traits)) - hairstyle = human_head_owner.hairstyle - if(owner_species.hair_color) - if(owner_species.hair_color == "mutcolor") - hair_color = human_head_owner.dna.features["mcolor"] - else if(hair_color == "fixedmutcolor") - hair_color = owner_species.fixed_mut_color - else - hair_color = owner_species.hair_color - else - hair_color = human_head_owner.hair_color - hair_alpha = owner_species.hair_alpha - else - hairstyle = "Bald" - hair_color = "#000000" - hair_alpha = initial(hair_alpha) - // lipstick if(human_head_owner.lip_style && (LIPS in owner_species.species_traits)) lip_style = human_head_owner.lip_style lip_color = human_head_owner.lip_color else lip_style = null lip_color = "white" - ..() -/obj/item/bodypart/head/update_icon_dropped() - var/list/standing = get_limb_icon(TRUE) - if(!standing.len) - icon_state = initial(icon_state)//no overlays found, we default back to initial icon. - return - for(var/image/img in standing) - img.pixel_x = px_x - img.pixel_y = px_y - add_overlay(standing) + ///FACIAL HAIR CHECKS START + //we check if our hat or helmet hides our facial hair. + facial_hair_hidden = FALSE + if(human_head_owner.head) + var/obj/item/hat = human_head_owner.head + if(hat.flags_inv & HIDEFACIALHAIR) + facial_hair_hidden = TRUE + + if(human_head_owner.wear_mask) + var/obj/item/mask = human_head_owner.wear_mask + if(mask.flags_inv & HIDEFACIALHAIR) + facial_hair_hidden = TRUE + ///FACIAL HAIR CHECKS END + ///HAIR CHECKS START + hair_hidden = FALSE + if(human_head_owner.head) + var/obj/item/hat = human_head_owner.head + if(hat.flags_inv & HIDEHAIR) + hair_hidden = TRUE + + if(human_head_owner.w_uniform) + var/obj/item/item_uniform = human_head_owner.w_uniform + if(item_uniform.flags_inv & HIDEHAIR) + hair_hidden = TRUE + + if(human_head_owner.wear_mask) + var/obj/item/mask = human_head_owner.wear_mask + if(mask.flags_inv & HIDEHAIR) + hair_hidden = TRUE + ///HAIR CHECKS END + + if(!hair_hidden && !owner.getorgan(/obj/item/organ/brain) && !(NOBLOOD in species_flags_list)) + show_debrained = TRUE + else + show_debrained = FALSE + + //CREATION-ONLY START + if(is_creating) + var/datum/sprite_accessory/sprite_accessory + + facial_overlay = null + facial_gradient_overlay = null + hair_overlay = null + hair_gradient_overlay = null + + hair_alpha = owner_species.hair_alpha + hair_color = human_head_owner.hair_color + facial_hair_color = human_head_owner.hair_color + fixed_hair_color = owner_species.fixed_mut_color //Can be null + hair_style = human_head_owner.hairstyle + facial_hairstyle = human_head_owner.facial_hairstyle + + + if(facial_hairstyle && !facial_hair_hidden && (FACEHAIR in species_flags_list)) + sprite_accessory = GLOB.facial_hairstyles_list[facial_hairstyle] + if(sprite_accessory) + //Create the overlay + facial_overlay = mutable_appearance(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER) + //Gradients + facial_hair_gradient_style = LAZYACCESS(human_head_owner.grad_style, GRADIENT_FACIAL_HAIR_KEY) + if(facial_hair_gradient_style) + facial_hair_gradient_color = LAZYACCESS(human_head_owner.grad_color, GRADIENT_FACIAL_HAIR_KEY) + facial_gradient_overlay = make_gradient_overlay(sprite_accessory.icon, sprite_accessory.icon_state, HAIR_LAYER, GLOB.facial_hair_gradients_list[facial_hair_gradient_style], facial_hair_gradient_color) + + facial_overlay.overlays += emissive_blocker(sprite_accessory.icon, sprite_accessory.icon_state, alpha = hair_alpha) + + if(!hair_hidden && !show_debrained && (HAIR in species_flags_list)) + sprite_accessory = GLOB.hairstyles_list[hair_style] + if(sprite_accessory) + hair_overlay = mutable_appearance(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER) + hair_gradient_style = LAZYACCESS(human_head_owner.grad_style, GRADIENT_HAIR_KEY) + if(hair_gradient_style) + hair_gradient_color = LAZYACCESS(human_head_owner.grad_color, GRADIENT_HAIR_KEY) + hair_gradient_overlay = make_gradient_overlay(sprite_accessory.icon, sprite_accessory.icon_state, HAIR_LAYER, GLOB.hair_gradients_list[hair_gradient_style], hair_gradient_color) + + //CREATION-ONLY END + //HAIR COLOR START + if(!override_hair_color) + if(hair_color_source) + if(hair_color_source == "fixedmutcolor") + SET_OVERLAY_VALUE(facial_overlay, color, fixed_hair_color) + SET_OVERLAY_VALUE(hair_overlay, color, fixed_hair_color) + else if(hair_color_source == "mutcolor") + SET_OVERLAY_VALUE(facial_overlay, color, facial_hair_color) + SET_OVERLAY_VALUE(hair_overlay, color, hair_color) + else + SET_OVERLAY_VALUE(facial_overlay, color, hair_color_source) + SET_OVERLAY_VALUE(hair_overlay, color, hair_color_source) + else + SET_OVERLAY_VALUE(facial_overlay, color, hair_color) + SET_OVERLAY_VALUE(hair_overlay, color, hair_color) + else + SET_OVERLAY_VALUE(facial_overlay, color, override_hair_color) + SET_OVERLAY_VALUE(hair_overlay, color, override_hair_color) + //HAIR COLOR END + +#undef SET_OVERLAY_VALUE +///////////////////////////////////////////////////////////////////////////////////////////////////////////////// /obj/item/bodypart/head/get_limb_icon(dropped, draw_external_organs) cut_overlays() . = ..() if(dropped) //certain overlays only appear when the limb is being detached from its owner. - if(status != BODYPART_ROBOTIC) //having a robotic head hides certain features. + if(IS_ORGANIC_LIMB(src)) //having a robotic head hides certain features. //facial hair - if(facial_hairstyle) + if(facial_hairstyle && (FACEHAIR in species_flags_list)) var/datum/sprite_accessory/sprite = GLOB.facial_hairstyles_list[facial_hairstyle] if(sprite) var/image/facial_overlay = image(sprite.icon, "[sprite.icon_state]", -HAIR_LAYER, SOUTH) @@ -237,8 +317,8 @@ debrain_overlay.icon_state = "debrained" . += debrain_overlay else - var/datum/sprite_accessory/sprite2 = GLOB.hairstyles_list[hairstyle] - if(sprite2) + var/datum/sprite_accessory/sprite2 = GLOB.hairstyles_list[hair_style] + if(sprite2 && (HAIR in species_flags_list)) var/image/hair_overlay = image(sprite2.icon, "[sprite2.icon_state]", -HAIR_LAYER, SOUTH) hair_overlay.color = hair_color hair_overlay.alpha = hair_alpha @@ -260,6 +340,47 @@ if(eyes.eye_color) eyes_overlay.color = eyes.eye_color + else + if(!facial_hair_hidden && facial_overlay && (FACEHAIR in species_flags_list)) + facial_overlay.alpha = hair_alpha + . += facial_overlay + if(facial_gradient_overlay) + . += facial_gradient_overlay + + if(show_debrained) + . += mutable_appearance('icons/mob/human_face.dmi', "debrained", HAIR_LAYER) + + else if(!hair_hidden && hair_overlay && (HAIR in species_flags_list)) + hair_overlay.alpha = hair_alpha + . += hair_overlay + if(hair_gradient_overlay) + . += hair_gradient_overlay +///Set the haircolor of a human. Override instead sets the override value, it will not be changed away from the override value until override is set to null. +/mob/proc/set_haircolor(hex_string, override) + return + +/mob/living/carbon/human/set_haircolor(hex_string, override) + var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) + if(!my_head) + return + + if(override) + my_head.override_hair_color = hex_string + else + my_head.hair_color = hex_string + update_hair(is_creating = TRUE) + +/obj/item/bodypart/head/proc/make_gradient_overlay(file, icon, layer, datum/sprite_accessory/gradient, grad_color) + RETURN_TYPE(/mutable_appearance) + + var/mutable_appearance/gradient_overlay = mutable_appearance(layer = -layer) + var/icon/temp = icon(gradient.icon, gradient.icon_state) + var/icon/temp_hair = icon(file, icon) + temp.Blend(temp_hair, ICON_ADD) + gradient_overlay.icon = temp + gradient_overlay.color = grad_color + return gradient_overlay + /obj/item/bodypart/head/talk_into(mob/holder, message, channel, spans, datum/language/language, list/message_mods) var/mob/headholder = holder if(istype(headholder)) @@ -274,7 +395,9 @@ /obj/item/bodypart/head/monkey icon = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_head" + limb_id = SPECIES_MONKEY animal_origin = MONKEY_BODYPART + bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC /obj/item/bodypart/head/alien icon = 'icons/mob/animal_parts.dmi' diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 858fdd2d3c8..60be92d76d0 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -121,52 +121,23 @@ return TRUE //Helper for quickly creating a new limb - used by augment code in species.dm spec_attacked_by -/mob/living/carbon/proc/newBodyPart(zone, robotic, fixed_icon) - var/obj/item/bodypart/new_bodypart - switch(zone) - if(BODY_ZONE_L_ARM) - new_bodypart = new /obj/item/bodypart/l_arm() - if(BODY_ZONE_R_ARM) - new_bodypart = new /obj/item/bodypart/r_arm() - if(BODY_ZONE_HEAD) - new_bodypart = new /obj/item/bodypart/head() - if(BODY_ZONE_L_LEG) - new_bodypart = new /obj/item/bodypart/l_leg() - if(BODY_ZONE_R_LEG) - new_bodypart = new /obj/item/bodypart/r_leg() - if(BODY_ZONE_CHEST) - new_bodypart = new /obj/item/bodypart/chest() - if(new_bodypart) - new_bodypart.update_limb(fixed_icon, src) - if(robotic) - new_bodypart.change_bodypart_status(BODYPART_ROBOTIC) - . = new_bodypart +// +// FUCK YOU AUGMENT CODE - With love, Kapu +/mob/living/carbon/proc/newBodyPart(zone) + var/path = dna.species.bodypart_overrides[zone] + var/obj/item/bodypart/new_bodypart = new path() + return new_bodypart -/mob/living/carbon/human/newBodyPart(zone, robotic, fixed_icon) - var/obj/item/bodypart/bodypart - var/datum/species/species = dna.species - var/obj/item/bodypart/selected_type = species.bodypart_overides[zone] - bodypart = new selected_type() - if(bodypart) - bodypart.update_limb(fixed_icon, src) - if(robotic) - bodypart.change_bodypart_status(BODYPART_ROBOTIC) - . = bodypart - -/mob/living/carbon/alien/larva/newBodyPart(zone, robotic, fixed_icon) +/mob/living/carbon/alien/larva/newBodyPart(zone) var/obj/item/bodypart/new_bodypart switch(zone) if(BODY_ZONE_HEAD) new_bodypart = new /obj/item/bodypart/head/larva() if(BODY_ZONE_CHEST) new_bodypart = new /obj/item/bodypart/chest/larva() - if(new_bodypart) - new_bodypart.update_limb(fixed_icon, src) - if(robotic) - new_bodypart.change_bodypart_status(BODYPART_ROBOTIC) . = new_bodypart -/mob/living/carbon/alien/humanoid/newBodyPart(zone, robotic, fixed_icon) +/mob/living/carbon/alien/humanoid/newBodyPart(zone) var/obj/item/bodypart/new_bodypart switch(zone) if(BODY_ZONE_L_ARM) @@ -182,10 +153,8 @@ if(BODY_ZONE_CHEST) new_bodypart = new /obj/item/bodypart/chest/alien() if(new_bodypart) - new_bodypart.update_limb(fixed_icon, src) - if(robotic) - new_bodypart.change_bodypart_status(BODYPART_ROBOTIC) - . = new_bodypart + new_bodypart.update_limb(src) + /proc/skintone2hex(skin_tone) @@ -217,37 +186,3 @@ . = "#fff4e6" if("orange") . = "#ffc905" - -/mob/living/carbon/proc/Digitigrade_Leg_Swap(swap_back) - var/body_plan_changed = FALSE - for(var/obj/item/bodypart/existing_bodypart as anything in bodyparts) - var/obj/item/bodypart/new_bodypart - if((!existing_bodypart.use_digitigrade && swap_back == FALSE) || (existing_bodypart.use_digitigrade && swap_back == TRUE)) - if(existing_bodypart.body_part == LEG_LEFT) - if(swap_back == TRUE) - new_bodypart = new /obj/item/bodypart/l_leg - else - new_bodypart = new /obj/item/bodypart/l_leg/digitigrade - else if(existing_bodypart.body_part == LEG_RIGHT) - if(swap_back == TRUE) - new_bodypart = new /obj/item/bodypart/r_leg - else - new_bodypart = new /obj/item/bodypart/r_leg/digitigrade - if(!new_bodypart) - continue - body_plan_changed = TRUE - existing_bodypart.drop_limb(1) - qdel(existing_bodypart) - new_bodypart.attach_limb(src) //no sanity for if this fails here because we just dropped out a limb of the same zone, SHOULD be okay - if(body_plan_changed && ishuman(src)) - var/mob/living/carbon/human/leg_owner = src - if(leg_owner.w_uniform) - var/obj/item/clothing/under/uniform = leg_owner.w_uniform - if(uniform.mutantrace_variation) - if(swap_back) - uniform.adjusted = NORMAL_STYLE - else - uniform.adjusted = DIGITIGRADE_STYLE - leg_owner.update_inv_w_uniform() - if(leg_owner.shoes && !(leg_owner.shoes.item_flags & IGNORE_DIGITIGRADE) && !swap_back) - leg_owner.dropItemToGround(leg_owner.shoes) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index f113f7efa4f..aff8b229975 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -6,12 +6,16 @@ max_damage = 200 body_zone = BODY_ZONE_CHEST body_part = CHEST + is_dimorphic = TRUE px_x = 0 px_y = 0 stam_damage_coeff = 1 max_stamina_damage = 120 grind_results = null wound_resistance = 10 + ///The bodytype required to attach to this chest + var/acceptable_bodytype = BODYTYPE_HUMANOID + var/obj/item/cavity_item /obj/item/bodypart/chest/can_dismember(obj/item/item) @@ -30,11 +34,14 @@ ..() /obj/item/bodypart/chest/monkey - icon = 'icons/mob/animal_parts.dmi' + icon_static = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_chest" + limb_id = SPECIES_MONKEY + should_draw_greyscale = FALSE animal_origin = MONKEY_BODYPART - part_origin = MONKEY_BODY wound_resistance = -10 + bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC + acceptable_bodytype = BODYTYPE_MONKEY /obj/item/bodypart/chest/alien icon = 'icons/mob/animal_parts.dmi' @@ -42,7 +49,6 @@ dismemberable = 0 max_damage = 500 animal_origin = ALIEN_BODYPART - part_origin = ALIEN_BODY /obj/item/bodypart/chest/larva icon = 'icons/mob/animal_parts.dmi' @@ -50,7 +56,6 @@ dismemberable = 0 max_damage = 50 animal_origin = LARVA_BODYPART - part_origin = LARVA_BODY /obj/item/bodypart/l_arm name = "left arm" @@ -132,10 +137,12 @@ /obj/item/bodypart/l_arm/monkey - icon = 'icons/mob/animal_parts.dmi' + icon_static = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_l_arm" + limb_id = SPECIES_MONKEY + should_draw_greyscale = FALSE animal_origin = MONKEY_BODYPART - part_origin = MONKEY_BODY + bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC wound_resistance = -10 px_x = -5 px_y = -3 @@ -149,7 +156,6 @@ can_be_disabled = FALSE max_damage = 100 animal_origin = ALIEN_BODYPART - part_origin = ALIEN_BODY /obj/item/bodypart/r_arm name = "right arm" @@ -229,10 +235,11 @@ /obj/item/bodypart/r_arm/monkey - icon = 'icons/mob/animal_parts.dmi' + icon_static = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_r_arm" + limb_id = SPECIES_MONKEY + bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC animal_origin = MONKEY_BODYPART - part_origin = MONKEY_BODY wound_resistance = -10 px_x = 5 px_y = -3 @@ -246,7 +253,6 @@ can_be_disabled = FALSE max_damage = 100 animal_origin = ALIEN_BODYPART - part_origin = ALIEN_BODY /obj/item/bodypart/l_leg @@ -316,16 +322,13 @@ else if(!bodypart_disabled) owner.set_usable_legs(owner.usable_legs + 1) - -/obj/item/bodypart/l_leg/digitigrade - name = "left digitigrade leg" - use_digitigrade = FULL_DIGITIGRADE - /obj/item/bodypart/l_leg/monkey - icon = 'icons/mob/animal_parts.dmi' + icon_static = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_l_leg" + limb_id = SPECIES_MONKEY + should_draw_greyscale = FALSE animal_origin = MONKEY_BODYPART - part_origin = MONKEY_BODY + bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC wound_resistance = -10 px_y = 4 @@ -338,7 +341,6 @@ can_be_disabled = FALSE max_damage = 100 animal_origin = ALIEN_BODYPART - part_origin = ALIEN_BODY /obj/item/bodypart/r_leg name = "right leg" @@ -409,16 +411,13 @@ else if(!bodypart_disabled) owner.set_usable_legs(owner.usable_legs + 1) - -/obj/item/bodypart/r_leg/digitigrade - name = "right digitigrade leg" - use_digitigrade = FULL_DIGITIGRADE - /obj/item/bodypart/r_leg/monkey icon = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_r_leg" + limb_id = SPECIES_MONKEY + should_draw_greyscale = FALSE animal_origin = MONKEY_BODYPART - part_origin = MONKEY_BODY + bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC wound_resistance = -10 px_y = 4 @@ -431,4 +430,3 @@ can_be_disabled = FALSE max_damage = 100 animal_origin = ALIEN_BODYPART - part_origin = ALIEN_BODY diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index 21384097bd0..65b466d2e62 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -13,14 +13,17 @@ /obj/item/bodypart/l_arm/robot name = "cyborg left arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb_continuous = list("slaps", "punches") - attack_verb_simple = list("slap", "punch") + limb_id = "robotic" + attack_verb_simple = list("slapped", "punched") inhand_icon_state = "buildpipe" - icon = 'icons/mob/augmentation/augments.dmi' + icon_static = 'icons/mob/augmentation/augments.dmi' + icon = null flags_1 = CONDUCT_1 icon_state = "borg_l_arm" - status = BODYPART_ROBOTIC - disable_threshold = 1 + is_dimorphic = FALSE + should_draw_greyscale = FALSE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -36,14 +39,17 @@ /obj/item/bodypart/r_arm/robot name = "cyborg right arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb_continuous = list("slaps", "punches") - attack_verb_simple = list("slap", "punch") + attack_verb_simple = list("slapped", "punched") inhand_icon_state = "buildpipe" - icon = 'icons/mob/augmentation/augments.dmi' + icon_static = 'icons/mob/augmentation/augments.dmi' + icon = null + limb_id = "robotic" flags_1 = CONDUCT_1 icon_state = "borg_r_arm" - status = BODYPART_ROBOTIC - disable_threshold = 1 + is_dimorphic = FALSE + should_draw_greyscale = FALSE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -59,14 +65,17 @@ /obj/item/bodypart/l_leg/robot name = "cyborg left leg" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb_continuous = list("kicks", "stomps") - attack_verb_simple = list("kick", "stomp") + attack_verb_simple = list("kicked", "stomped") inhand_icon_state = "buildpipe" - icon = 'icons/mob/augmentation/augments.dmi' + icon_static = 'icons/mob/augmentation/augments.dmi' + icon = null + limb_id = "robotic" flags_1 = CONDUCT_1 icon_state = "borg_l_leg" - status = BODYPART_ROBOTIC - disable_threshold = 1 + is_dimorphic = FALSE + should_draw_greyscale = FALSE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -82,14 +91,17 @@ /obj/item/bodypart/r_leg/robot name = "cyborg right leg" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - attack_verb_continuous = list("kicks", "stomps") - attack_verb_simple = list("kick", "stomp") + attack_verb_simple = list("kicked", "stomped") inhand_icon_state = "buildpipe" - icon = 'icons/mob/augmentation/augments.dmi' + icon_static = 'icons/mob/augmentation/augments.dmi' + icon = null + limb_id = "robotic" flags_1 = CONDUCT_1 icon_state = "borg_r_leg" - status = BODYPART_ROBOTIC - disable_threshold = 1 + is_dimorphic = FALSE + should_draw_greyscale = FALSE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -106,10 +118,15 @@ name = "cyborg torso" desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell." inhand_icon_state = "buildpipe" - icon = 'icons/mob/augmentation/augments.dmi' + icon_static = 'icons/mob/augmentation/augments.dmi' + icon = null + limb_id = "robotic" flags_1 = CONDUCT_1 icon_state = "borg_chest" - status = BODYPART_ROBOTIC + is_dimorphic = FALSE + should_draw_greyscale = FALSE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -209,10 +226,15 @@ name = "cyborg head" desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals." inhand_icon_state = "buildpipe" - icon = 'icons/mob/augmentation/augments.dmi' + icon_static = 'icons/mob/augmentation/augments.dmi' + limb_id = "robotic" + icon = null flags_1 = CONDUCT_1 icon_state = "borg_head" - status = BODYPART_ROBOTIC + is_dimorphic = FALSE + should_draw_greyscale = FALSE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm new file mode 100644 index 00000000000..a581790b31f --- /dev/null +++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm @@ -0,0 +1,31 @@ +/obj/item/bodypart/head/ethereal + icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi' + limb_id = SPECIES_ETHEREAL + is_dimorphic = FALSE + uses_mutcolor = TRUE + +/obj/item/bodypart/chest/ethereal + icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi' + limb_id = SPECIES_ETHEREAL + is_dimorphic = FALSE + uses_mutcolor = TRUE + +/obj/item/bodypart/l_arm/ethereal + icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi' + limb_id = SPECIES_ETHEREAL + uses_mutcolor = TRUE + +/obj/item/bodypart/r_arm/ethereal + icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi' + limb_id = SPECIES_ETHEREAL + uses_mutcolor = TRUE + +/obj/item/bodypart/l_leg/ethereal + icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi' + limb_id = SPECIES_ETHEREAL + uses_mutcolor = TRUE + +/obj/item/bodypart/r_leg/ethereal + icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi' + limb_id = SPECIES_ETHEREAL + uses_mutcolor = TRUE diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm new file mode 100644 index 00000000000..7821c3a155c --- /dev/null +++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm @@ -0,0 +1,77 @@ +/obj/item/bodypart/head/lizard + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + limb_id = SPECIES_LIZARD + uses_mutcolor = TRUE + is_dimorphic = FALSE + +/obj/item/bodypart/chest/lizard + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + uses_mutcolor = TRUE + limb_id = SPECIES_LIZARD + is_dimorphic = TRUE + +/obj/item/bodypart/l_arm/lizard + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + uses_mutcolor = TRUE + limb_id = SPECIES_LIZARD + +/obj/item/bodypart/r_arm/lizard + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + uses_mutcolor = TRUE + limb_id = SPECIES_LIZARD + +/obj/item/bodypart/l_leg/lizard + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + uses_mutcolor = TRUE + limb_id = SPECIES_LIZARD + +/obj/item/bodypart/r_leg/lizard + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + uses_mutcolor = TRUE + limb_id = SPECIES_LIZARD + +/obj/item/bodypart/l_leg/digitigrade + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + uses_mutcolor = TRUE + limb_id = "digitigrade" + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE + +/obj/item/bodypart/l_leg/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) + . = ..() + if(ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + var/uniform_compatible = FALSE + var/suit_compatible = FALSE + if(!(human_owner.w_uniform) || (human_owner.w_uniform.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) //Checks uniform compatibility + uniform_compatible = TRUE + if((!human_owner.wear_suit) || (human_owner.wear_suit.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON)) || !(human_owner.wear_suit.body_parts_covered & LEGS)) //Checks suit compatability + suit_compatible = TRUE + + if((uniform_compatible && suit_compatible) || (suit_compatible && human_owner.wear_suit?.flags_inv & HIDEJUMPSUIT)) //If the uniform is hidden, it doesnt matter if its compatible + limb_id = "digitigrade" + + else + limb_id = "lizard" + +/obj/item/bodypart/r_leg/digitigrade + icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' + uses_mutcolor = TRUE + limb_id = "digitigrade" + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE + +/obj/item/bodypart/r_leg/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) + . = ..() + if(ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + var/uniform_compatible = FALSE + var/suit_compatible = FALSE + if(!(human_owner.w_uniform) || (human_owner.w_uniform.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) //Checks uniform compatibility + uniform_compatible = TRUE + if((!human_owner.wear_suit) || (human_owner.wear_suit.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON)) || !(human_owner.wear_suit.body_parts_covered & LEGS)) //Checks suit compatability + suit_compatible = TRUE + + if((uniform_compatible && suit_compatible) || (suit_compatible && human_owner.wear_suit?.flags_inv & HIDEJUMPSUIT)) //If the uniform is hidden, it doesnt matter if its compatible + limb_id = "digitigrade" + + else + limb_id = "lizard" diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm new file mode 100644 index 00000000000..247706becd1 --- /dev/null +++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm @@ -0,0 +1,422 @@ +///SNAIL +/obj/item/bodypart/head/snail + limb_id = SPECIES_SNAIL + is_dimorphic = FALSE + +/obj/item/bodypart/chest/snail + limb_id = SPECIES_SNAIL + is_dimorphic = FALSE + +/obj/item/bodypart/l_arm/snail + limb_id = SPECIES_SNAIL + +/obj/item/bodypart/r_arm/snail + limb_id = SPECIES_SNAIL + +/obj/item/bodypart/l_leg/snail + limb_id = SPECIES_SNAIL + +/obj/item/bodypart/r_leg/snail + limb_id = SPECIES_SNAIL + +///ABDUCTOR +/obj/item/bodypart/head/abductor + limb_id = SPECIES_ABDUCTOR + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/abductor + limb_id = SPECIES_ABDUCTOR + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/abductor + limb_id = SPECIES_ABDUCTOR + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/abductor + limb_id = SPECIES_ABDUCTOR + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/abductor + limb_id = SPECIES_ABDUCTOR + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/abductor + limb_id = SPECIES_ABDUCTOR + should_draw_greyscale = FALSE + +///JELLY +/obj/item/bodypart/head/jelly + limb_id = SPECIES_JELLYPERSON + is_dimorphic = TRUE + +/obj/item/bodypart/chest/jelly + limb_id = SPECIES_JELLYPERSON + is_dimorphic = TRUE + +/obj/item/bodypart/l_arm/jelly + limb_id = SPECIES_JELLYPERSON + +/obj/item/bodypart/r_arm/jelly + limb_id = SPECIES_JELLYPERSON + +/obj/item/bodypart/l_leg/jelly + limb_id = SPECIES_JELLYPERSON + +/obj/item/bodypart/r_leg/jelly + limb_id = SPECIES_JELLYPERSON + +///SLIME +/obj/item/bodypart/head/slime + limb_id = SPECIES_SLIMEPERSON + is_dimorphic = FALSE + +/obj/item/bodypart/chest/slime + limb_id = SPECIES_SLIMEPERSON + is_dimorphic = TRUE + +/obj/item/bodypart/l_arm/slime + limb_id = SPECIES_SLIMEPERSON + +/obj/item/bodypart/r_arm/slime + limb_id = SPECIES_SLIMEPERSON + +/obj/item/bodypart/l_leg/slime + limb_id = SPECIES_SLIMEPERSON + +/obj/item/bodypart/r_leg/slime + limb_id = SPECIES_SLIMEPERSON + +///ZOMBIE +/obj/item/bodypart/head/zombie + limb_id = SPECIES_ZOMBIE + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/zombie + limb_id = SPECIES_ZOMBIE + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/zombie + limb_id = SPECIES_ZOMBIE + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/zombie + limb_id = SPECIES_ZOMBIE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/zombie + limb_id = SPECIES_ZOMBIE + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/zombie + limb_id = SPECIES_ZOMBIE + should_draw_greyscale = FALSE + +///PODPEOPLE +/obj/item/bodypart/head/pod + limb_id = SPECIES_PODPERSON + is_dimorphic = TRUE + +/obj/item/bodypart/chest/pod + limb_id = SPECIES_PODPERSON + is_dimorphic = TRUE + +/obj/item/bodypart/l_arm/pod + limb_id = SPECIES_PODPERSON + +/obj/item/bodypart/r_arm/pod + limb_id = SPECIES_PODPERSON + +/obj/item/bodypart/l_leg/pod + limb_id = SPECIES_PODPERSON + +/obj/item/bodypart/r_leg/pod + limb_id = SPECIES_PODPERSON + +///FLY +/obj/item/bodypart/head/fly + limb_id = SPECIES_FLYPERSON + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/fly + limb_id = SPECIES_FLYPERSON + is_dimorphic = TRUE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/fly + limb_id = SPECIES_FLYPERSON + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/fly + limb_id = SPECIES_FLYPERSON + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/fly + limb_id = SPECIES_FLYPERSON + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/fly + limb_id = SPECIES_FLYPERSON + should_draw_greyscale = FALSE + +///SHADOW +/obj/item/bodypart/head/shadow + limb_id = SPECIES_SHADOW + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/shadow + limb_id = SPECIES_SHADOW + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/shadow + limb_id = SPECIES_SHADOW + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/shadow + limb_id = SPECIES_SHADOW + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/shadow + limb_id = SPECIES_SHADOW + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/shadow + limb_id = SPECIES_SHADOW + should_draw_greyscale = FALSE + +///SKELETON +/obj/item/bodypart/head/skeleton + limb_id = SPECIES_SKELETON + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/skeleton + limb_id = SPECIES_SKELETON + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/skeleton + limb_id = SPECIES_SKELETON + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/skeleton + limb_id = SPECIES_SKELETON + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/skeleton + limb_id = SPECIES_SKELETON + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/skeleton + limb_id = SPECIES_SKELETON + should_draw_greyscale = FALSE + +///MUSHROOM +/obj/item/bodypart/head/mushroom + limb_id = SPECIES_MUSHROOM + is_dimorphic = TRUE + +/obj/item/bodypart/chest/mushroom + limb_id = SPECIES_MUSHROOM + is_dimorphic = TRUE + +/obj/item/bodypart/l_arm/mushroom + limb_id = SPECIES_MUSHROOM + +/obj/item/bodypart/r_arm/mushroom + limb_id = SPECIES_MUSHROOM + +/obj/item/bodypart/l_leg/mushroom + limb_id = SPECIES_MUSHROOM + +/obj/item/bodypart/r_leg/mushroom + limb_id = SPECIES_MUSHROOM + +///GOLEMS (i hate xenobio SO FUCKING MUCH) +/obj/item/bodypart/head/golem + limb_id = SPECIES_GOLEM + is_dimorphic = FALSE + +/obj/item/bodypart/chest/golem + limb_id = SPECIES_GOLEM + is_dimorphic = TRUE + +/obj/item/bodypart/l_arm/golem + limb_id = SPECIES_GOLEM + +/obj/item/bodypart/r_arm/golem + limb_id = SPECIES_GOLEM + +/obj/item/bodypart/l_leg/golem + limb_id = SPECIES_GOLEM + +/obj/item/bodypart/r_leg/golem + limb_id = SPECIES_GOLEM + +/// +/obj/item/bodypart/head/golem/cult + limb_id = SPECIES_GOLEM_CULT + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/golem/cult + limb_id = SPECIES_GOLEM_CULT + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/golem/cult + limb_id = SPECIES_GOLEM_CULT + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/golem/cult + limb_id = SPECIES_GOLEM_CULT + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/golem/cult + limb_id = SPECIES_GOLEM_CULT + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/golem/cult + limb_id = SPECIES_GOLEM_CULT + should_draw_greyscale = FALSE + +/// +/obj/item/bodypart/head/golem/cloth + limb_id = SPECIES_GOLEM_CLOTH + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/golem/cloth + limb_id = SPECIES_GOLEM_CLOTH + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/golem/cloth + limb_id = SPECIES_GOLEM_CLOTH + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/golem/cloth + limb_id = SPECIES_GOLEM_CLOTH + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/golem/cloth + limb_id = SPECIES_GOLEM_CLOTH + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/golem/cloth + limb_id = SPECIES_GOLEM_CLOTH + should_draw_greyscale = FALSE + +/// +/obj/item/bodypart/head/golem/cardboard + limb_id = SPECIES_GOLEM_CARDBOARD + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/golem/cardboard + limb_id = SPECIES_GOLEM_CARDBOARD + is_dimorphic = TRUE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/golem/cardboard + limb_id = SPECIES_GOLEM_CARDBOARD + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/golem/cardboard + limb_id = SPECIES_GOLEM_CARDBOARD + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/golem/cardboard + limb_id = SPECIES_GOLEM_CARDBOARD + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/golem/cardboard + limb_id = SPECIES_GOLEM_CARDBOARD + should_draw_greyscale = FALSE + +/// +/obj/item/bodypart/head/golem/durathread + limb_id = SPECIES_GOLEM_DURATHREAD + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/golem/durathread + limb_id = SPECIES_GOLEM_DURATHREAD + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/golem/durathread + limb_id = SPECIES_GOLEM_DURATHREAD + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/golem/durathread + limb_id = SPECIES_GOLEM_DURATHREAD + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/golem/durathread + limb_id = SPECIES_GOLEM_DURATHREAD + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/golem/durathread + limb_id = SPECIES_GOLEM_DURATHREAD + should_draw_greyscale = FALSE + +/// +/obj/item/bodypart/head/golem/bone + limb_id = SPECIES_GOLEM_BONE + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/golem/bone + limb_id = SPECIES_GOLEM_BONE + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/golem/bone + limb_id = SPECIES_GOLEM_BONE + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/golem/bone + limb_id = SPECIES_GOLEM_BONE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/golem/bone + limb_id = SPECIES_GOLEM_BONE + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/golem/bone + limb_id = SPECIES_GOLEM_BONE + should_draw_greyscale = FALSE + +/// +/obj/item/bodypart/head/golem/snow + limb_id = SPECIES_GOLEM_SNOW + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/golem/snow + limb_id = SPECIES_GOLEM_SNOW + is_dimorphic = TRUE //WHO MADE SNOW BREASTS? + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/golem/snow + limb_id = SPECIES_GOLEM_SNOW + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/golem/snow + limb_id = SPECIES_GOLEM_SNOW + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/golem/snow + limb_id = SPECIES_GOLEM_SNOW + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/golem/snow + limb_id = SPECIES_GOLEM_SNOW + should_draw_greyscale = FALSE diff --git a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm new file mode 100644 index 00000000000..6d8bb3fd27a --- /dev/null +++ b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm @@ -0,0 +1,30 @@ +/obj/item/bodypart/head/moth + icon_static = 'icons/mob/species/moth/bodyparts.dmi' + limb_id = SPECIES_MOTH + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/moth + icon_static = 'icons/mob/species/moth/bodyparts.dmi' + limb_id = SPECIES_MOTH + is_dimorphic = TRUE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/moth + icon_static = 'icons/mob/species/moth/bodyparts.dmi' + limb_id = SPECIES_MOTH + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/moth + icon_static = 'icons/mob/species/moth/bodyparts.dmi' + limb_id = SPECIES_MOTH + should_draw_greyscale = FALSE +/obj/item/bodypart/l_leg/moth + icon_static = 'icons/mob/species/moth/bodyparts.dmi' + limb_id = SPECIES_MOTH + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/moth + icon_static = 'icons/mob/species/moth/bodyparts.dmi' + limb_id = SPECIES_MOTH + should_draw_greyscale = FALSE diff --git a/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm new file mode 100644 index 00000000000..d711bd43001 --- /dev/null +++ b/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm @@ -0,0 +1,31 @@ +/obj/item/bodypart/head/plasmaman + icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi' + limb_id = SPECIES_PLASMAMAN + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/chest/plasmaman + icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi' + limb_id = SPECIES_PLASMAMAN + is_dimorphic = FALSE + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_arm/plasmaman + icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi' + limb_id = SPECIES_PLASMAMAN + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_arm/plasmaman + icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi' + limb_id = SPECIES_PLASMAMAN + should_draw_greyscale = FALSE + +/obj/item/bodypart/l_leg/plasmaman + icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi' + limb_id = SPECIES_PLASMAMAN + should_draw_greyscale = FALSE + +/obj/item/bodypart/r_leg/plasmaman + icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi' + limb_id = SPECIES_PLASMAMAN + should_draw_greyscale = FALSE diff --git a/code/modules/surgery/bodyparts/wounds.dm b/code/modules/surgery/bodyparts/wounds.dm new file mode 100644 index 00000000000..be4d5072316 --- /dev/null +++ b/code/modules/surgery/bodyparts/wounds.dm @@ -0,0 +1,209 @@ +/// Allows us to roll for and apply a wound without actually dealing damage. Used for aggregate wounding power with pellet clouds +/obj/item/bodypart/proc/painless_wound_roll(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus, sharpness=NONE) + SHOULD_CALL_PARENT(TRUE) + + if(!owner || phantom_wounding_dmg <= WOUND_MINIMUM_DAMAGE || wound_bonus == CANT_WOUND) + return + + var/mangled_state = get_mangled_state() + var/bio_state = owner.get_biological_state() + var/easy_dismember = HAS_TRAIT(owner, TRAIT_EASYDISMEMBER) // if we have easydismember, we don't reduce damage when redirecting damage to different types (slashing weapons on mangled/skinless limbs attack at 100% instead of 50%) + + if(wounding_type == WOUND_BLUNT && sharpness) + if(sharpness & SHARP_EDGED) + wounding_type = WOUND_SLASH + else if (sharpness & SHARP_POINTY) + wounding_type = WOUND_PIERCE + + //Handling for bone only/flesh only(none right now)/flesh and bone targets + switch(bio_state) + // if we're bone only, all cutting attacks go straight to the bone + if(BIO_JUST_BONE) + if(wounding_type == WOUND_SLASH) + wounding_type = WOUND_BLUNT + phantom_wounding_dmg *= (easy_dismember ? 1 : 0.6) + else if(wounding_type == WOUND_PIERCE) + wounding_type = WOUND_BLUNT + phantom_wounding_dmg *= (easy_dismember ? 1 : 0.75) + if((mangled_state & BODYPART_MANGLED_BONE) && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus)) + return + // note that there's no handling for BIO_JUST_FLESH since we don't have any that are that right now (slimepeople maybe someday) + // standard humanoids + if(BIO_FLESH_BONE) + // if we've already mangled the skin (critical slash or piercing wound), then the bone is exposed, and we can damage it with sharp weapons at a reduced rate + // So a big sharp weapon is still all you need to destroy a limb + if(mangled_state == BODYPART_MANGLED_FLESH && sharpness) + playsound(src, "sound/effects/wounds/crackandbleed.ogg", 100) + if(wounding_type == WOUND_SLASH && !easy_dismember) + phantom_wounding_dmg *= 0.6 // edged weapons pass along 60% of their wounding damage to the bone since the power is spread out over a larger area + if(wounding_type == WOUND_PIERCE && !easy_dismember) + phantom_wounding_dmg *= 0.75 // piercing weapons pass along 75% of their wounding damage to the bone since it's more concentrated + wounding_type = WOUND_BLUNT + else if(mangled_state == BODYPART_MANGLED_BOTH && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus)) + return + + check_wounding(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus) + +/** + * check_wounding() is where we handle rolling for, selecting, and applying a wound if we meet the criteria + * + * We generate a "score" for how woundable the attack was based on the damage and other factors discussed in [/obj/item/bodypart/proc/check_woundings_mods], then go down the list from most severe to least severe wounds in that category. + * We can promote a wound from a lesser to a higher severity this way, but we give up if we have a wound of the given type and fail to roll a higher severity, so no sidegrades/downgrades + * + * Arguments: + * * woundtype- Either WOUND_BLUNT, WOUND_SLASH, WOUND_PIERCE, or WOUND_BURN based on the attack type. + * * damage- How much damage is tied to this attack, since wounding potential scales with damage in an attack (see: WOUND_DAMAGE_EXPONENT) + * * wound_bonus- The wound_bonus of an attack + * * bare_wound_bonus- The bare_wound_bonus of an attack + */ +/obj/item/bodypart/proc/check_wounding(woundtype, damage, wound_bonus, bare_wound_bonus, attack_direction) + SHOULD_CALL_PARENT(TRUE) + RETURN_TYPE(/datum/wound) + + if(HAS_TRAIT(owner, TRAIT_NEVER_WOUNDED)) + return + + // note that these are fed into an exponent, so these are magnified + if(HAS_TRAIT(owner, TRAIT_EASILY_WOUNDED)) + damage *= 1.5 + else + damage = min(damage, WOUND_MAX_CONSIDERED_DAMAGE) + + if(HAS_TRAIT(owner,TRAIT_HARDLY_WOUNDED)) + damage *= 0.85 + + if(HAS_TRAIT(owner, TRAIT_EASYDISMEMBER)) + damage *= 1.1 + + var/base_roll = rand(1, round(damage ** WOUND_DAMAGE_EXPONENT)) + var/injury_roll = base_roll + injury_roll += check_woundings_mods(woundtype, damage, wound_bonus, bare_wound_bonus) + var/list/wounds_checking = GLOB.global_wound_types[woundtype] + + if(injury_roll > WOUND_DISMEMBER_OUTRIGHT_THRESH && prob(get_damage() / max_damage * 100)) + var/datum/wound/loss/dismembering = new + dismembering.apply_dismember(src, woundtype, outright = TRUE, attack_direction = attack_direction) + return + + // quick re-check to see if bare_wound_bonus applies, for the benefit of log_wound(), see about getting the check from check_woundings_mods() somehow + if(ishuman(owner)) + var/mob/living/carbon/human/human_wearer = owner + var/list/clothing = human_wearer.clothingonpart(src) + for(var/obj/item/clothing/clothes_check as anything in clothing) + // unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary + if(clothes_check.armor.getRating(WOUND)) + bare_wound_bonus = 0 + break + + //cycle through the wounds of the relevant category from the most severe down + for(var/datum/wound/possible_wound as anything in wounds_checking) + var/datum/wound/replaced_wound + for(var/datum/wound/existing_wound as anything in wounds) + if(existing_wound.type in wounds_checking) + if(existing_wound.severity >= initial(possible_wound.severity)) + return + else + replaced_wound = existing_wound + + if(initial(possible_wound.threshold_minimum) < injury_roll) + var/datum/wound/new_wound + if(replaced_wound) + new_wound = replaced_wound.replace_wound(possible_wound, attack_direction = attack_direction) + else + new_wound = new possible_wound + new_wound.apply_wound(src, attack_direction = attack_direction) + log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned + return new_wound + +// try forcing a specific wound, but only if there isn't already a wound of that severity or greater for that type on this bodypart +/obj/item/bodypart/proc/force_wound_upwards(specific_woundtype, smited = FALSE) + SHOULD_NOT_OVERRIDE(TRUE) + + var/datum/wound/potential_wound = specific_woundtype + for(var/datum/wound/existing_wound as anything in wounds) + if(existing_wound.wound_type == initial(potential_wound.wound_type)) + if(existing_wound.severity < initial(potential_wound.severity)) // we only try if the existing one is inferior to the one we're trying to force + existing_wound.replace_wound(potential_wound, smited) + return + + var/datum/wound/new_wound = new potential_wound + new_wound.apply_wound(src, smited = smited) + +/** + * check_wounding_mods() is where we handle the various modifiers of a wound roll + * + * A short list of things we consider: any armor a human target may be wearing, and if they have no wound armor on the limb, if we have a bare_wound_bonus to apply, plus the plain wound_bonus + * We also flick through all of the wounds we currently have on this limb and add their threshold penalties, so that having lots of bad wounds makes you more liable to get hurt worse + * Lastly, we add the inherent wound_resistance variable the bodypart has (heads and chests are slightly harder to wound), and a small bonus if the limb is already disabled + * + * Arguments: + * * It's the same ones on [/obj/item/bodypart/proc/receive_damage] + */ +/obj/item/bodypart/proc/check_woundings_mods(wounding_type, damage, wound_bonus, bare_wound_bonus) + SHOULD_CALL_PARENT(TRUE) + + var/armor_ablation = 0 + var/injury_mod = 0 + + if(owner && ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + var/list/clothing = human_owner.clothingonpart(src) + for(var/obj/item/clothing/clothes as anything in clothing) + // unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary + armor_ablation += clothes.armor.getRating(WOUND) + if(wounding_type == WOUND_SLASH) + clothes.take_damage_zone(body_zone, damage, BRUTE) + else if(wounding_type == WOUND_BURN && damage >= 10) // lazy way to block freezing from shredding clothes without adding another var onto apply_damage() + clothes.take_damage_zone(body_zone, damage, BURN) + + if(!armor_ablation) + injury_mod += bare_wound_bonus + + injury_mod -= armor_ablation + injury_mod += wound_bonus + + for(var/datum/wound/wound as anything in wounds) + injury_mod += wound.threshold_penalty + + var/part_mod = -wound_resistance + if(get_damage(TRUE) >= max_damage) + part_mod += disabled_wound_penalty + + injury_mod += part_mod + + return injury_mod + + /// Get whatever wound of the given type is currently attached to this limb, if any +/obj/item/bodypart/proc/get_wound_type(checking_type) + RETURN_TYPE(checking_type) + SHOULD_NOT_OVERRIDE(TRUE) + + if(isnull(wounds)) + return + + for(var/wound in wounds) + if(istype(wound, checking_type)) + return wound + +/** + * update_wounds() is called whenever a wound is gained or lost on this bodypart, as well as if there's a change of some kind on a bone wound possibly changing disabled status + * + * Covers tabulating the damage multipliers we have from wounds (burn specifically), as well as deleting our gauze wrapping if we don't have any wounds that can use bandaging + * + * Arguments: + * * replaced- If true, this is being called from the remove_wound() of a wound that's being replaced, so the bandage that already existed is still relevant, but the new wound hasn't been added yet + */ +/obj/item/bodypart/proc/update_wounds(replaced = FALSE) + SHOULD_CALL_PARENT(TRUE) + + var/dam_mul = 1 //initial(wound_damage_multiplier) + + // we can (normally) only have one wound per type, but remember there's multiple types (smites like :B:loodless can generate multiple cuts on a limb) + for(var/datum/wound/iter_wound as anything in wounds) + dam_mul *= iter_wound.damage_mulitplier_penalty + + if(!LAZYLEN(wounds) && current_gauze && !replaced) // no more wounds = no need for the gauze anymore + owner.visible_message(span_notice("\The [current_gauze.name] on [owner]'s [name] falls away."), span_notice("The [current_gauze.name] on your [parse_zone(body_zone)] falls away.")) + QDEL_NULL(current_gauze) + + wound_damage_multiplier = dam_mul diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index e202820df2e..f0860fac8f6 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -65,7 +65,7 @@ /datum/surgery/implant_removal/mechanic name = "implant removal" - requires_bodypart_type = BODYPART_ROBOTIC + requires_bodypart_type = BODYTYPE_ROBOTIC steps = list( /datum/surgery_step/mechanic_open, /datum/surgery_step/open_hatch, diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index 2348e8f920d..cfd3e471c47 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -20,7 +20,7 @@ if(istype(tool, /obj/item/borg/apparatus/organ_storage) && istype(tool.contents[1], /obj/item/bodypart)) tool = tool.contents[1] var/obj/item/bodypart/aug = tool - if(aug.status != BODYPART_ROBOTIC) + if(IS_ORGANIC_LIMB(aug)) to_chat(user, span_warning("That's not an augment, silly!")) return -1 if(aug.body_zone != target_zone) @@ -59,7 +59,12 @@ tool.cut_overlays() tool = tool.contents[1] if(istype(tool) && user.temporarilyRemoveItemFromInventory(tool)) - tool.replace_limb(target, TRUE) + if(!tool.replace_limb(target)) + display_results(user, target, span_warning("You fail in replacing [target]'s [parse_zone(target_zone)]! Their body has rejected [tool]!"), + span_warning("[user] fails to replace [target]'s [parse_zone(target_zone)]!"), + span_warning("[user] fails to replaces [target]'s [parse_zone(target_zone)]!")) + tool.forceMove(target.loc) + return display_results(user, target, span_notice("You successfully augment [target]'s [parse_zone(target_zone)]."), span_notice("[user] successfully augments [target]'s [parse_zone(target_zone)] with [tool]!"), span_notice("[user] successfully augments [target]'s [parse_zone(target_zone)]!")) diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 1921bf6dff3..676c8c74012 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -37,7 +37,7 @@ /datum/surgery/organ_manipulation/mechanic name = "Prosthesis organ manipulation" possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD) - requires_bodypart_type = BODYPART_ROBOTIC + requires_bodypart_type = BODYTYPE_ROBOTIC lying_required = FALSE self_operable = TRUE steps = list( diff --git a/code/modules/surgery/organs/external/_external_organs.dm b/code/modules/surgery/organs/external/_external_organs.dm index cb3607afc5d..63c97c21a16 100644 --- a/code/modules/surgery/organs/external/_external_organs.dm +++ b/code/modules/surgery/organs/external/_external_organs.dm @@ -74,11 +74,11 @@ bodypart.contents.Add(src) ///Add the overlays we need to draw on a person. Called from _bodyparts.dm -/obj/item/organ/external/proc/get_overlays(list/overlay_list, image_dir, image_layer, body_type, image_color) +/obj/item/organ/external/proc/get_overlays(list/overlay_list, image_dir, image_layer, physique, image_color) if(!sprite_datum) return - var/gender = (body_type == FEMALE) ? "f" : "m" + var/gender = (physique == FEMALE) ? "f" : "m" var/finished_icon_state = (sprite_datum.gender_specific ? gender : "m") + "_" + feature_key + "_" + sprite_datum.icon_state + mutant_bodyparts_layertext(image_layer) var/mutable_appearance/appearance = mutable_appearance(sprite_datum.icon, finished_icon_state, layer = -image_layer) appearance.dir = image_dir diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index ef98d9c876a..3b71ac866b2 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -250,7 +250,7 @@ if(owner.health < 5 && COOLDOWN_FINISHED(src, adrenaline_cooldown)) COOLDOWN_START(src, adrenaline_cooldown, rand(25 SECONDS, 1 MINUTES)) to_chat(owner, span_userdanger("You feel yourself dying, but you refuse to give up!")) - owner.heal_overall_damage(15, 15, 0, BODYPART_ORGANIC) + owner.heal_overall_damage(15, 15, 0, BODYTYPE_ORGANIC) if(owner.reagents.get_reagent_amount(/datum/reagent/medicine/ephedrine) < 20) owner.reagents.add_reagent(/datum/reagent/medicine/ephedrine, 10) diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm index a26c586541e..fb0f462d010 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/prosthetic_replacement.dm @@ -42,14 +42,15 @@ tool = organ_storage_contents if(istype(tool, /obj/item/bodypart)) var/obj/item/bodypart/bodypart_to_attach = tool - if(bodypart_to_attach.status != BODYPART_ROBOTIC) + if(IS_ORGANIC_LIMB(bodypart_to_attach)) organ_rejection_dam = 10 if(ishuman(target)) var/mob/living/carbon/human/human_target = target - if(!(bodypart_to_attach.part_origin & human_target.dna.species.allowed_animal_origin)) + var/obj/item/bodypart/chest/target_chest = human_target.get_bodypart(BODY_ZONE_CHEST) + if(!(bodypart_to_attach.bodytype & target_chest.acceptable_bodytype)) to_chat(user, span_warning("[bodypart_to_attach] doesn't match the patient's morphology.")) return -1 - if(human_target.dna.species.id != bodypart_to_attach.species_id) + if(human_target.dna.species.id != bodypart_to_attach.limb_id) organ_rejection_dam = 30 if(target_zone == bodypart_to_attach.body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm. diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index eaec3c8b652..ca778dab316 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -7,7 +7,7 @@ var/can_cancel = TRUE //Can cancel this surgery after step 1 with cautery var/list/target_mobtypes = list(/mob/living/carbon/human) //Acceptable Species var/location = BODY_ZONE_CHEST //Surgery location - var/requires_bodypart_type = BODYPART_ORGANIC //Prevents you from performing an operation on incorrect limbs. 0 for any limb type + var/requires_bodypart_type = BODYTYPE_ORGANIC //Prevents you from performing an operation on incorrect limbs. 0 for any limb type var/list/possible_locs = list() //Multiple locations var/ignore_clothes = FALSE //This surgery ignores clothes var/mob/living/carbon/target //Operation target mob diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index cad988d6c63..2e9dd6b43a3 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -25,6 +25,8 @@ /mob/dview, //Requires a circuit url /obj/effect/mapping_helpers/circuit_spawner, + //Template type + /obj/item/bodypart, ) //Say it with me now, type template ignore += typesof(/obj/effect/mapping_helpers/atom_injector) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 16918e08ab4..61739757cb3 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -599,7 +599,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(5) // limb squish! for(var/i in C.bodyparts) var/obj/item/bodypart/squish_part = i - if(squish_part.is_organic_limb()) + if(IS_ORGANIC_LIMB(squish_part)) var/type_wound = pick(list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate)) squish_part.force_wound_upwards(type_wound) else diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 42cec530da3..ac629053477 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -4,7 +4,6 @@ zone = BODY_ZONE_HEAD slot = ORGAN_SLOT_ZOMBIE icon_state = "blacktumor" - visual = FALSE var/causes_damage = TRUE var/datum/species/old_species = /datum/species/human var/living_transformation_time = 30 @@ -31,7 +30,7 @@ /obj/item/organ/zombie_infection/Remove(mob/living/carbon/M, special = 0) . = ..() STOP_PROCESSING(SSobj, src) - if(iszombie(M) && old_species && !QDELETED(M)) + if(iszombie(M) && old_species && !special && !QDELETED(src)) M.set_species(old_species) if(timer_id) deltimer(timer_id) @@ -41,7 +40,7 @@ web of pus and viscera, bound tightly around the brain like some \ biological harness.") -/obj/item/organ/zombie_infection/process(delta_time) +/obj/item/organ/zombie_infection/process(delta_time, times_fired) if(!owner) return if(!(src in owner.internal_organs)) @@ -50,7 +49,7 @@ return if (causes_damage && !iszombie(owner) && owner.stat != DEAD) owner.adjustToxLoss(0.5 * delta_time) - if(DT_PROB(5, delta_time)) + if (DT_PROB(5, delta_time)) to_chat(owner, span_danger("You feel sick...")) if(timer_id) return @@ -66,9 +65,9 @@ not even death can stop, you will rise again!") var/revive_time = rand(revive_time_min, revive_time_max) var/flags = TIMER_STOPPABLE - timer_id = addtimer(CALLBACK(src, .proc/zombify), revive_time, flags) + timer_id = addtimer(CALLBACK(src, .proc/zombify, owner), revive_time, flags) -/obj/item/organ/zombie_infection/proc/zombify() +/obj/item/organ/zombie_infection/proc/zombify(mob/living/carbon/target) timer_id = null if(!converts_living && owner.stat != DEAD) @@ -76,24 +75,24 @@ if(!iszombie(owner)) old_species = owner.dna.species.type - owner.set_species(/datum/species/zombie/infectious) + target.set_species(/datum/species/zombie/infectious) - var/stand_up = (owner.stat == DEAD) || (owner.stat == UNCONSCIOUS) + var/stand_up = (target.stat == DEAD) || (target.stat == UNCONSCIOUS) //Fully heal the zombie's damage the first time they rise - owner.setToxLoss(0, 0) - owner.setOxyLoss(0, 0) - owner.heal_overall_damage(INFINITY, INFINITY, INFINITY, null, TRUE) + target.setToxLoss(0, 0) + target.setOxyLoss(0, 0) + target.heal_overall_damage(INFINITY, INFINITY, INFINITY, null, TRUE) - if(!owner.revive(full_heal = FALSE, admin_revive = FALSE)) + if(!target.revive()) return - owner.grab_ghost() - owner.visible_message(span_danger("[owner] suddenly convulses, as [owner.p_they()][stand_up ? " stagger to [owner.p_their()] feet and" : ""] gain a ravenous hunger in [owner.p_their()] eyes!"), span_alien("You HUNGER!")) - playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, TRUE) - owner.do_jitter_animation(living_transformation_time) - owner.Stun(living_transformation_time) - to_chat(owner, span_alertalien("You are now a zombie! Do not seek to be cured, do not help any non-zombies in any way, do not harm your zombie brethren and spread the disease by killing others. You are a creature of hunger and violence.")) + target.grab_ghost() + target.visible_message(span_danger("[owner] suddenly convulses, as [owner.p_they()][stand_up ? " stagger to [owner.p_their()] feet and" : ""] gain a ravenous hunger in [owner.p_their()] eyes!"), span_alien("You HUNGER!")) + playsound(target.loc, 'sound/hallucinations/far_noise.ogg', 50, 1) + target.do_jitter_animation(living_transformation_time) + target.Stun(living_transformation_time) + to_chat(target, span_alertalien("You are now a zombie! Do not seek to be cured, do not help any non-zombies in any way, do not harm your zombie brethren and spread the disease by killing others. You are a creature of hunger and violence.")) /obj/item/organ/zombie_infection/nodamage causes_damage = FALSE diff --git a/icons/mob/augmentation/augments.dmi b/icons/mob/augmentation/augments.dmi index 4449da22d5863f31ef28f649ec71fbf999bb7c7f..21e55386d3a0d4a008e26c3254924b38d7c89bf8 100644 GIT binary patch delta 227 zcmV<90383}5ake%i+{~}R9JLGWpiV4X>fFDZ*Bkpc$}5f!4AS83;@tGdN-SFg$2)8zQG^K@{ovTaTu<}~d2cT7EVkdUo?kIVx-pM&R z>?x6;2I=03b;7|MW@uXDRL3QVKBJ^pXqU5;+)#|L#Kkw(Tvy;2tuaY!F2xkz3Z`+* zH4F*GQ*3}&5cQDH5U6F#9~ar deh=}LgE(hZQ~IC%0__MVH3F#+wzFLU1P9E9ZIJ)~ delta 223 zcmV<503iS65aAGzi+{;_R9JLGWpiV4X>fFDZ*Bkpc$}5f!3x4K3;@t``xRw73gXnO z7uk><+%J^Q#kJ6_kXHSDw|Ni;cG)d~*EAt*D$d2FtVDh-`4i9^*Nc-lZg-r$OcV5w z9QK@PFs%-s#0M2%2onveNjPf^`tb~BcT^pWarQ-4D(n^&l2eqGTJ_6UB8^#Tp(PZf zsG9~K7FF%Am9tT^2(@%NYcpPzOlM=o=fFDZ*Bkpc$}5e!3x753;@uxeucF6v2MHW zGFnOx>o16{nF_W-lYuc`7^}VA{KyTd4uIzF+Qt~n~=p{Ly zDA8b)4&THF5nu@mbb||K-g@3GiR9JLGWpiV4X>fFDZ*Bkpc$|&Wy$ZrG5CGsgd5X~PV%60} zTBL)0g%Hh|1kx5RL0{ii2Wf`nwmbOl53UxM?%EHcz4iPB7~DLGvpDVcoV}fnc1ey0 z&MY`%<1YzOMOebhg3=Xd+F@90ID4WRVU3$V@>1bgR7g@@S~fM6MA?`1QPjgi wh(&du(a7Y~CPO`)CTr%ql4){Qj&7e}D{IjW?f1n#=en@dCr}&gvq1si1+%zaCjbBd diff --git a/icons/mob/augmentation/augments_mining.dmi b/icons/mob/augmentation/augments_mining.dmi index 3942dc0c851277d46c74c388528d4e06b69d676f..39df4823fd1c02e254c3081ac7c6752b30245285 100644 GIT binary patch delta 1953 zcmV;S2VVHQ4%QEl7Yg7A0{{R3E%Tbwks&yL0RNCHD>YI8d4T}HnVFe~aTrrmQ>CS) zfPjF&z`!jnEpl>l-k9z+00001bW%=J06^y0W&i*HvwBombVOxyV{&P5bZKvH004NL zjncsigD?yR;B)&FMek#7yY4a+@i1SZbZcx2RUs|g>(A<~FwHH2FFz!t6pyCudQm@r zJN^L-Zl1(l+)iiCzD`HGG}jAf7M!thYeG~Jma?#*v>Xb~w8N05I2%xnkm@R9<011> z;ju!J^3tkF6T(Q$OAm$+Mp17IArh{!x#Q!$W;8N8UA04zPP4W5Q^|B)j7HPr{F9|< z`g;A^A9*#%;H>v4C;$KkaY;l$RCt_!?VXE~qB;!fvfBZ$9n_s~+wUz>5ndQy?GJ~;UI=j5@An5O!$X$6eEfY? zRbl{5T1v1A3G6GjLDHTZ{~-IPBb`pC@Gobt_H?Fw#o2dCYh!{B&K{f_qcxX*K=Jr= z4AHd_186A#S)-#5&K{j>V_E;DCN3G<<>4N>th;u zDNI)wUarq`Qb;)eah|?`Zf4&8ToC;U`(1U)l<1y1ZittSiovs3IQ=DRI61&(p_)>G^N000000000000000 z0I+e$OfC_%@-`3~+TeOZ;ETk)eVag$sE}N<C9$zet&WS8#2UK*rffcCHM!Prleb&Q=eqd=*PqVrc5 z2mk;80Pv=0Ypw8q!=&@Z7-@Z+v&OD@g`oFZYtL@s+0=Dy!ymgvWL!R1w{4l^79dqX zQ+sc{XYH+r~$(1XHB%*N`_WXL*)w6d^uYy~S-RXT%Cd{q-f)@YVQ=J7Es*ahkCUv5&PZ26878gjx; zUw>S9Ub_2FBk3u%a`~=TGop(M$;#!sevb4cYFsN30?tX73^aA8N0001g0Dxk+QDEckrS-d1{A}8`mUgHt zuHPl%XX8Wox@lS_LUH{r5&s@UuqExj_HC4)xB^S-cZvA-7;=TOJ!)$)39i7>`duP^ zOd&L2jbnpWs?dc1o*yE`^}9s;T|6H$A&$ung7L1gO`D7BcZv8hg&}crB6Wk%zzp4} zUocI7itBfY_|Zl8Ay$~MM`_1uwu_4EcZvABv49V;zz?y&D9%}JI!2!=uHPl%M@UvD z66X6Iv|NVe^*cHK0(=Q<+z>6T-zDNNKtf2{^WRnos3hQ?>8UO$Q00000003Zd zn(;^Z#ESrD5BWLEpEL}{5LaOQ;rnzFfBP;>e@s0Af}Pz|YZvu@ zNkLuP(TPrh@ZYyH%%nex;#-71qyj(V>L7N6Qs`ic%MxB!V6whgp;Vv=J;)X~R`|;L zLh^G86x!%821(juH6c)zW>#=XKBLdm>GOS00=#xZ?4d!DptlVD?7Fx~ZrA;M(>@$0 n(dZYy%}Vpu#Q^}o-^V}QzE`e45B$Ik00000NkvXXu0mjfIo-k1 delta 1796 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 diff --git a/icons/mob/augmentation/surplus_augments.dmi b/icons/mob/augmentation/surplus_augments.dmi index bc3e4bd73ca96dee18c1fa071a74e60062b19c2d..0fafab0533694e6849267db5fdc2b144e18bf0e1 100644 GIT binary patch delta 111 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 delta 4849 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 diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi index c9ec0084b1912a80fcf8bfa6b04559cfd01f9248..625e588d3a4367b5c34abcc7a4686ef24ecf5385 100644 GIT binary patch literal 53101 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
e_aWkE4laBpQ@-^R|5&^&@s2~x? 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 z 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 Vy=s8?BM@m+`Rc7JS&EN*{|8|Y>C6BC literal 61173 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 Ag#Z8m literal 50154 zcmb@u1yoe+`z}0)gd(MMivdarC?PGWh=>YEcPJeK(uzn6D2RxNl&Ew|4oE5`-Hd>A zhcLjveD}up{r%7XobRl2zO}wt${J?x+56egbH{aE_x%uZ`<62Kai-%a6pH-1iozWf zijV{TqezM2laUcZLlo-B9nX9BT@@@`%$y%Mx;}8QN1;64rN5SQNVvox+cB8S6xG7`$JE<-6`iudOB<(X;w z8FoX`ch7L~;LUk!jgX*%fd>}4tP||g%^wub+1rO2n7yNq_26}LxaIaE?8ZnEO3JMu zxA>*n=v0jZm2dA4lB^e(A64jHeOSVnm07&V%-im7V5b?@@T_=RzWh1y&ABCm_ttM$ zPc*sFIX%^BXbAtoJJ0eqP`~G>G=yc-3sO;6myZpECwA^5{t@d9V| zB4N&>r?u6(gCvH$$)B0E3JWNUhJRa#pLZfYv7l!9?ch#db+_-a%Bm*nkNbDtmg}IK z3w#Ud&&4+|URn?hJGPKLN3#@HGwj7;G9-}xIpI$j?}Dh8#!H=d1cknZZ}OImHI?_y zt!}X?zu8iKFmJif*|OVa7-LRnRg;C`J#TBKd+O$bdFs5^tW45(ql`+^#FxH`k=V=p z+}LldJJ%)iTghY+ls$=4U-=w~#Nrfr_)sec90oixF?HMc9n{y1I076S){4`L94md_ z1A9vaxA;Y!u9?MuCCHrMn|o^iYLi=P|7Cko&xi_mvpS<@JvMnw#H?<1=dK)2Mw)@o ziy+f}ZXS%{xgQnl%M;kZsT%A6-Yt&$-PZ4aEOW43kcXqn%X(&>Pt7BXmdm-`{~|$=(MvLfC4yJf z?e3|j^)xLJCkyqDj}}@lzdDHh%=P}P-I5ctdZV7&z3(BhBFou&AeN%wzDIm zMqbe;9$Sj~2P3c7lyn>l$m^_H^&mNi*ZK>J%!vi-2W4jBO`@sfTA>bZ_ykr=xX2sU zq~Ks{!TbI{pFUO&>Q$@Q_FivX6TKHt$iY*eJ8&@G>*;o4yh7w#8v6cYQPM3%;c7eW{BypXY3J!b6l%kYBTD%^2_aJ${Z;md4sN)qcYd6loKktHO-Z$!lKbQ|n7@ zR~LC`cT`21+bZZvKH2H8FZ&InRT1EowU(=|$#7nH&6wNrK=!h0vW@3Z3pu|!hy&5! zx>4SbGkkcWOv#T^$PFmr24gAdQ!gmLWvetQMKP5>pIuQubH$bX`v9plX(>}Rm58qH zGK2I!8ataBX<3QyRAx89ZsKp~1?%O1_U-fUn7Sapxt&37Ctp-FLcPB~#~7e)>?y0C z|9R|Fp76xBd*U_R4~rPOELk{9LpSfp8c$p&=Fvl)89$h=+rDdW$9J@S*M_p@j0)D( z6%^9w={SlwQb?V&vSg?F_#CyeqV9NGPf{iwU^ZFfV1DL*3B!n*MSiI^DmmIY)~sUt ziAgL+?M@P!GWu{xqebuqreRpEHou)v+UHFIM)}`*aHpuL=W1)Yl27s7oW5qRxQH_nJ9r*5VCp%zTT>NmRQApnQ{_nxb8zI6n}jhnzNBsV zcJ+fZuv}jyEf}g-mAzdLvc}iqB&L&sH|vi)3l6rw=&~)iWWcZ#Bbyp}np%dDS5cEh5ws5mhH~YS=H^ijI&0U7__AUV$gwb2ss= z$9GnkX5)0RJ=)oKEoLwj4T%OrW%u}s@Zv;a!NGL(Qx{b6(X84u?52~1L3O9oSz|lL z7~S93XD-_16}uZ1+v%`>rH}129376z#{O*V6EZzRZ08-9!E4|h9KlhvBkFu6xNLpJ zu!{JP=0e(1jkZzotw*_r!l~qzzcHcV?RYEvZ}ncUc4l-gaofYwjxH|ADDkg+*+%F-lR6Xp`3s2U;|$rapd~qe$=CA>1bc03ff28 zx$4M?&u>0CxhA}kbR*r;n;q?}Gvvu#!$f#n$1d-iRbnLEHfr5ne)_Q`7nzj$edN|^ zA*1M=cj(|&uKZle5gY7PQffc!H}-CAzl|TE1RPaVgIN&_`tOClYUf6;^S(|dGjPl` zJmWK;aN7&dfAiL@k0ea=FVIiEf4|-{hHhCMh~J^Vn_sjOcU|wqd9yQJ>jD#u2AiQ3 z>_gYODJHb}nLX*v#icfQ>9yO9-nrvvF!M4ToSY|xNYF4_9COR^8dG+2xy5ABVHX_; z?H8Y!6UP%hVQf%F9E^1~X!}~+@tc&@QjZo0IDE9v!bHeEC^K0jK+SY~QH(9E1&1^o z+x*iFZqJ@5!&8N2DgSxJO!<<|@CR-EvaBOXi_(^xn=%qhc?^7f?hxr7nkT){#0}S8 z+e>nn4GwO0%b|>TJNnE*k=H-B%1^r-yV{ejytH4D#`~>f#8>yX5pT`w{A2#Fzn5q(S)s_0wD!vh^zT}!rrd=gHI-#uE!rJ+Y z%cRGEFO{Kp8NM(%FDrBDr$dEw^n=s;9TE`#i;OK>$pt=f6J3(RcG;sZj){h~60KVD zm2{XtJTS5d8SP9&^3JujI(RKCPb$o+gN0lbv^27_@C=K!tr4h|kI+ zU(vUFHAS1B5k|xC-su_|9#uW;7P(Hkchsiekym&bBOl5*%#%%hILQ;)HMO z3mI)@b4pz6!+_w-h}b2m)X6Z9cnmYEOd)xJncin|NOMRSgIC%(6BXnxPR^IliC~QI zx?cD1p~ESIoY<9zI(>M~17w2W6@8f(tOs5yO#h~2av#!+C{}P@Ki$dl0^Q4n=R%;m; zB=%rcFW~=aNJ!!t`}@8d!wwWv#CV!^ewa;WYA$4*Ki$^Fglxg)Z} z6sdd-xWdCHE)WwOkaC)+57*WS_*FL19GawNV8D9ootO!hL;pmL`a3bf1&VN9Rla}k zVms5G_#!8V{{#g^N_IAR%_eRSZs7Xp5o0xlEVGfSmUnh6kGAR5k67U`VNbq#WKL2r z4t*47CIyQB>!zefqu8GPV8Pi;k`+uUr*>}AaG&1rI%5&WXG6Vvr$xrS_Ha2`TJ(eM z8~N{9HX7ZSHt_cVtYiH^T;k2)lsb##l2Cj8g+Cmg>uH@!`H4uJubREU$XpwU-{#T( zvwQy&vYgZwPAykBQm`Ku`C0tV>_37meo7C#MM1&bXG8bd`|yZX2J3Dv01p&fvsY#n3no?pJVRj3A!?oCV;SgPZX5R9C1_ z*4LgO$R$i{s%}Z)J@zk|1n6lK=En`Il==^hoIX>=X$_c#CNHuKPOY2+z~C(*k*6&;24X%7d>=o3)@*Bl(f$J9uP7F_mu#X) zD$aWLn1YJ$2;%PrtZ^A9a@LQ#n8s;44#g9#vTzg#{I`e@cB;cH|LWjU7Jy}`kMJDX z@J9G|C1WqWmNedjf@<&-av`!)dcL7{GTGLUi=Bq2?Y_d(UI?hguk7DK)y%gs=RMeF zdq8+QIt-9|t91}-e^Wo^Y1yeCvpCHPO2x|?_CCI1z`)O>UBW~!0eMZFc=NrHm4#W7A1TCG&cJ%0!b|7Jfl|d z&Mq&%`rx0V?&7%wj4UkmzkYG}&q+|J%j_4~N0i5AB>6H$tC(v^9FC@W$W`Z=p|*C= zDXv?_O)prVj|EcQ&4qXaVdezlc+@&Z?L^H#VtMkNr+zT56c-mWmNR%GL8qjoM6V>^ z@G4mkYKfYW$kJ(jS&HaJGj2>}&{R29WBHjP@;v5F;xfnfTjPblydgeUfoj$#h4`B1 zv*%W47B*+`=g%JoCZ-!`BMprw5XexC_9X8Z(K$I3(JBhMxTzOAT;S5WmG8)+rXZIZ zEq!xeqPdj%F*yXwnIrOXODZ*^_CXk0w56FGhM)Q9Th={7$L7 zlU1A>zoyb3nT;C?s^m$}-Urmy)@}~Hg1~rVG*Go-TJfght73|e>FJ8uxw-0?$6eJw z#-5AoG0!h7q!&HeNgCa@YJV49LR7M~oEeU@qD#`U{H??hM9Hqz@lHJTMMOk8o`Jfl zJ$%+rBGIqlK}UnIRr@D6JS~3R{1mS&ovg&KQ^WYs+D}_EN{#)EpFVwhvtd>6V7MU0 z^noDWCG*p#C@udVt!P#fKcy8VZgYFmYu%fReiHBfgw|NjA_h*zK`iZJKp^UAd{09o z`n^3Tal*s`EcOM$4O?woaeyOZ>qEi~wD*QX+>;ksZcI|W9Xa9ieiiTh3M_^hUj;8d zA!?Rf8Y%1U?ClMNx%zY5rP$BKB1I(k13_5De_4a#3V$5Z>> zJ(VQSLj7ES!X#U{L_WL_-MCF@O?xXkOAR$W@5R_axqAKdd11WU(1hN*GfETk#xs@* z_~AL6Fj>cS&OH-?mjPvcsOFbT$G`FpO6Tfm*I1Ow@%neX_G1iNEhbwP-Vm@kT7S126WKk@u6wT|EgfAIw%BJv^?(F7#-t8kV?hg}Jt$bUAXV$oLXCiO7*D7_W z%6-MKX=`cNZjei8t{3kng*QL7Uj&xeG*;#HXd(0U>(`shxdWQhuU@^H*4Pp_w(n4i48WA2K$e!47QE(d zKC!X2waUZThkZ;`f<#>1KYvCQ*@-ulgbgl>HQy&~!wIb5PIazx_+kbhv^-eb>->ZX z^x9s2mJz4X-m%j({5&R}wVN zQIeBi$6FM+%-jlkbLxT@!Q~B^Zs!&mYCd*1M(hK|QA-J$BbHrWtSN>~1)Rz@HkpHV zd9+KW980n)-U1Q_E56$je|G;YbWK>5$XV+16a^eUE98a-GbA^_tIH8Vtnm8(3l07U zRQ^qHWRJEMbu_)J?1n{}oL@L7F=x?W77s)v03KeFkft7Fhd^BrTWHnsrNV9Lnx-Z# zF)^{@MEx<%Y1HiEVBteEvoo*^j+2_6I9U!<=`cC!)0Z#bo)D6x6_3O5`D&lNOP4O8 zP{B=;q(OCeCWY}WqIiX(%Z`8_2cI+GP%4!EV0oeop;^&uHa0c{D6g$W0#r|5-;D@% z(xZ8g7Wy{52nh)Xif!UzM1pJ4vtFoy@<%*Jp7}gix|N zI`KsWZ@#WCxm9Qw7(`T8OW)Jhu3K_T&Cl1EN7))1qck-&VURbr13P^tM!oq@qkumzD zUj4~6^FLL=4LAV|7*tm+5F>N4;SxKSXLaM7{>pny6hY)hq!lo`%I@x>sI(bOSpV{} z{T!K7=9e$1o0Oz`dwc08j!v$L?e6V$YmX{2n;Rck>Dq(Ar#EyC4Lx*Y4i27HYYm_` zKOtQ_G(4<{#w1m*XLBEa`}S>`z_q^PL3OBbOoYnKweNIB)121RemfwJye2+O{^k!t zQ$C@7g7v?5<1&4Y4Gb{cxN+m>zyK*~c6RoX1+%4{ zcjx&t!?ieps((B4TNMGxIl0sEg8pBK0?% zfaG7;-rTjjyNkM+TR|Pr0gtzNm1WK4%w*X8-rim@=ie&3Rsb?rv2Zn5hgA zH4m06SFSv7Z2S1}<9Swglq6f^n-|stvI7@)D32ZyUKa?xJ?%HXbEu^#ynbEQEba2k zVw2O`shAb@f<^r4^z=02$^*2>HO^=iKR)7d)8ltIsG^){^)+a&P?4ss$Og*{4t)}x z_M4kZI;3Sfy1aCHJsp2&NRK*Bw=&+%ktXa8FcAFJOM$YW7A#)6^b)h;&K)Xb6-^!4 zl*}D!Vsi=Si$22?@o~~>T81qW-Z51ZE8M^M@0iXJ`;R+%^!aCGWRQ$IGDNG?uM&I` z*#e)iDw3N<^-QkSOs=Ug;yThZGPp)57-3>q5)%`3HZX&O53sjfVL?yRB@hZDzhB_n zuIc(NbBL`9By;-{s^@u$jbMUSJ*)0agw<+IGg0XTtlo_GIUP`fu~0pGQfI^AcTa9B zwq_C65}I^L(51QD=Fdk@4M1>y>k zH>dioAfEM&FI|1Su+`0qjpV5{kF>3T;U$rMmxO41N=nLR|KNJ=e%Vd7NabBl*Q)g- z^Z;RV`Jd|ua(b@7`D9|k6jex4-O$kRQLRqUg}UITCHX3m-2p+G`-dZM@cMk^s1T)8 z&mshiS>JLocpU4bDD8scE#XXDnDI<_^XAef*7H(%gw}WTmiXC0U;Ah2Z}5uhwL@ht z8L&zzsi}mJ5@L77JP@G8R-~O6*m|u-#l^re*6DQLlAG1&Lov2URikI`?3UDc>4YUI zwSJ&WW=#%UTJR|={-|!nV78{y@ZGnnymazbR$M1Tj)sPY{(`JWE?Z2Nm)dFVdAz)7 z5+r5MNgakSZohb3R1vk*H>$$1~oT{p-Ve@}HH2{j1l!&O(NdE(PsScTV zdeQY^O4Q9cGGXb`!KJ*e9V<6I1vKHMeHM^K{;1@yQzL%L4FEd@iiBsuz zTGNCmm^O0UBNilW+p2CAvEJawBp>=3qHsh_P3^_jmRt9_fO9QwW{g;mmgC#6Umph5 z-qb!^(y=$+mf28KIBPV`p}bY2DuHd`^*1k8oVF^_Wfq$J!F#oU9NhT_Zl=+VNaZq< zn$b>aC_=KWt(#*8z^-GyY85z7-2f7PJwmyA=6&x0|4C}bhSnp&tyY!Fw<7EJe+T3x`gHDE#c~G#Tol&!mxoPwzMc=m8+&Apu$diQ4u4Gz-FO_woz~j-X7J z%QP1U^6O%jg4?QhZQZ=(rguQA;CplspGa6Z32Joo{y+gLe~1MKLV$Esr-D!iNp8PQ z*+wMTNAoS)yZ%K*MW0Z&H8f1z?%Lldy8F7ZQHe#``~Jh5sIT5T1&dLl=i13qca7W( z>A!{RBS-9PZDZKt;OmPWbVMq!Ql9fY7kc{pCx6ujSc-CG0uY5jSX5f7%A6ItvmFr; z;jvsclUDCN|2gBHAhxIrhYuj3OsTGB%ea-;RfX5n)$M`lw=R_~2?a39e=W&#{=$Ws z8kY{KIDY9YR|;^QXsH29`YhEr{^ZO|p8bdChPEzWxx&b{vOd-F5%UCz;8&_&Z&iME zojbW)zQ8|f28Yv2hYODsb`bC&^@rfa|Kt_KG2-(YXn0{3IXQ*;2Metl~UC`4;$X+4jQj^5-!y%Tfd z+{fDvm$V5cnQc(~1wd__$0I!?DNwU3D@kh?$BbqTsKy8o|Kd#1sehpjL9}tgMXr*a zB51~EoA4LwUm5JJ{PedCy($^@L#-46RIPgy!71Efo)gKuN~L!-XdW3G%c`9{`Ow59 znQvF&eCjTSecqXtvpVpsL?Z8;m$ltXK-0ml=&*Dy|uNh zni{#kI^Eb$F1MAjY%e@dXo`ra=)&XXbMo&3Ao5yUTN@`U!F^x5w;WM8%qkpoVc)Gg zQh?x{rXpn!qJl6y=j&K83jaKV@~ZChezd`dZR7&wimc-kAKJJ?7j`;Y<;}?9qb4M5 z(`4z>y?G<2B~dq?XLmT_XFiFn9rAFzAR&Q{V`AP#T|F{wdNws9qbaX~qlT;75a)}p zEM?ZawF%@0=u?PGR5t;z3G~a2^MEC zQh<8A(I#q9B=4?NGMwYX`O46zzWP1;7I+o)AW;&i&^jR(98DuaSeLI|2u(SE@)#(F zbG|cKRaFK={@?}*oYXY5wAYtjfq55y{`|d5oT{6@;c?-c0}UF*Kb}<|Hy`Dg&!~7+ z1C2-d_jXWoa{8-Z<4Q^JfcpYw==}N9*zN9g!@{45>b>OvjqXbgvMcaT_&2sR)b0_2 z2Ry6FN29}(Qoq9I5Mv*Szwc~q?)2Fn4N^I48nzJ-tb)ibI_FLv!|wZfNV0KJ;o=JoL6T>()wLPl1-hyv2ssN z!L9bfeTBztLoY6JI z4(LQ*r5A&64tF-I)?l>8J3`OJt{vdcGsV(Ow1Q~SoqVJ27@yaSsN=q9qtcmn z-m@R$3DGGjoUrt&Gyy_nHKG{r?vqK3zr;U~9L5D#RV^meam!Hx!AX-eU9Ahm7Igkv zJFTb=0;u1DU#EzNDCTIftXh-Q6wpnEzRA?eeo1#1hG*#)!3 zpFWWS2CDwCFYh?fS0)&-BCDu%*@R4fZX4NefF#}9Noh#V&m;* z7Z(-4;3=^YVl(zide%R7ama(H);^_6hCrWMQbIR6I%;ietDvl`ysKI1kOtQ`sBjyv z4>?78^azA9F{g>60Ahm(NhlcZV9i~CX8uvSxj0lzw&vljG#nnRt)~~Zw}NIrbLI>K z3yT5=mF!=3i6n|g3tA(O`VGV$&BrV&eqg|cC2|8v$+PL_zo)4=K2qi~XZmyDPpG0! zIpw$1&QIka!nv}$y1Se8=NOUcb(KJ!YORKl>sDHLzDJK=_FLO z$vwUHWYGszQ-rf&97Vbt6jU23-DlFe)i2b>$98 z2q>vN>2AdDulP~Ij5&${7D`ThX)WA*9qgC+k1sMT{N$z{) zihuAo`4dF|*M%pqutj!YS2oXo6gvhy3rIKv1A_`>y#;lEFSU`ko3W>(eLY*7>1`f1 z*=`I*W)jSx=a)7!J`RmLC&@+$O2IDx_4OUL@_v43i**bJBQUjr)^>C_Ha-iOJG{!v9?JyZme{v&bfoe{vxASCYM;&0FB96wFo_c> z(a24N7IF|bDp5XFlrawz7&@OyK7=hG!2_u@?dMvX-`-1a=)mEghWlO;hUx*74{D%= zVenZB_r*(9r~QYQl)x*{p$#iabWew{LlbukiSow-X8}3&0_}~7iAl@wVsh$#B)#;r zk={2@NEd9&J$;f&YIFl((ocOeu8fZpv&HR*Usd(vd zBAa(#PfuF^cyJOkqfz~roSeq!Gs;~uE)}ECo9OT2>l;bH1pZgHt-gCYQK_Nm#sT4z zns8hgXUvZ1d1Nvx+*kVc@}6HRM=+Agj9%kgnTo+GuhQjx0e_xB za|&50HcF5xVrnt^a6;EoR5E~~&cVU>D|j$j>xU18idGP|RSnK04SO_w)w~ z%IX$g$kSg^P|##{?T@i5bM{NWHI|c0vhQ|Em6=1DcY(`KtcgL8qfr#B5Z^c%qR^GV z(MkdcjJebB5na9TG4nSzPf|O{)St|Cytm67_mF(yD8_4%oCfj`XoFcc4uH$XALrdU zC|0E05a0q$R1&C~IE~_y6z=CMj-TR?hd+C=Ho>7+*)gcmQ~ zz--0HRiH#cS#rm$dq_T~yyhTDCf`fpZ9!38TtIuIz%9(=AkO_D#QJfb>UeT-lnB() z3qqK+jk?Jy?DbD;q;_(HmfmBe^?$1fv^Wq_M~{l@>gl!F6H*U8b6brQXZVe>ooi`z z2R-OwpYJ8eZI_MyR{EhQf&Us(q~hfK|J1JVAAuVD2+5THbUmcJdv@*gBk}sPoId#o zJbatcTARCAn>V;tEa*`A+`Qzp@W;i03H6edI8|?9Q!5)~OFi?_06H$rA~E38K{;-k zJLt`Hfi?!mu$6$?4`!d6=l8%{KTVUR^C8Ajme5EU@XuyrC;Gj zes~N4Pv{TN^;K2EB_vjz=i7`_Pb3veh>?lj`%+ zgG!rLPrKu{GZp8wG;~FBYru?KK%l8b0L{yX7d_673=2jCpOK(0tOfRFYM+U}nUa@B zb?Ve9(!gt78|=peF9`}h0pfJ_)%7gHDqUUgE=q*=q&#-KnurZUW61y^rjz(ZN^LQm zKYu>0KKIk7n)>>qV}5uajKoUiWQE6CiUZVd=1Q6!H)lJ4!7(Ucc*EESD%=H>l$8kr za-W7}Vp3C6kq=}g{6lT7<^@!c)1TS?MO729K8UWlC;=(68GjW^ouin|81q8b^Q@Pxn& z?v?LXGCDwEk`G9(g3t@khKXYJd-(9U-)@HA#p*aFc9ir1*6gc3|L>`()A2VaW@PYX zF$BgiyTQemh=_>59qEX6l0-4JSSSk*w*%h zUWx4!AnLr;C9IJ$2V&CLUxXl?oIV-yp`hTTawJ>Z1^z>NO-hc8cISfpB%!Q{$?3+XrhKQ##!an}FJG={x(wsOD~u5?LEUCzZA}UWtxC^^ zf-A-zc!Ci86AL$+!-8`$u(GPD2b`1<)fI|YxXct-H!geq`mxZku;`oTff6Nlul=Jr zT2P-LW`!P%x<3p30Fgr8zGXsnCs1YS6cWR*#M~C&m@Eh=;GRA`0#ZXyPtS*@2rd*8L|NGaae0euy_S$(#(SS@@GuSa{bH_x?TG*^|d^s;MQXr5%Nd09G%~>L5p? z0@-s2WF!QZgHr>l`EECL{RNc!(xJYc!udI4oay_DgdS9dcGESwY9mVrmtPOd>O_*?^bDj`FQDY_JUx9xzY=$ z(E+Vn{V7j*JyH#BsEPq|9D6*&YCBYP48kZkFE8Rx=?&`VU(I13KYq;3!&3(zjJsY< zucr?T`tk*cOC6LQ-`%omU!%Y0kH8*7zx_w`rh@g8YwwQmKM${ZO|Pm!11cSmzq2Pp z6xju+ND-NaE{XLLmom^0Ktj3bgR4*s`+c+VEUbVtw;Mpx5ac18+D-uEPf@;CbSa(Ojg5^^rb&|`Jc|8I(F_kf=DEO!8%)|~T;JG$VCX#bgeOCB7K$zugAGB6 z$TVy+omhCBmHuO8yYR3qaeIG%-(w-W^fqWEuej827`(WB|9-H_S)nrr4Po>e!0kL1 zjW5lLxz18Svb%lf&Qr}yt=e%%-Y;0EqLPyN{%a}cZvGXW54p^k(`hJ2WCAm`FJ&Hg zyuWK;0>Zx`H%<8zv8a-CP~9SS$PJn?Qh+@G9D*tKYli8YU#A$p*H06Dv1OO3f`Ueb`|ZDnRj0pK{jod8gt3}}U9 zNTszf!I;qjy)VKU9ehFi{i%?nW4?QKgC;XY`W<1V7+<}((E~b|HwifYKYWwJrj$(L z)924}&>nOlKP)s9K#JLoMcda4k853EH_N|)AUF-s=4Hyzlo4l=<2+HL?J$quPmmbz z3crOedT1HqN%8{$QYhU=ONt~oc(xCM)9BL_?s>q1)TBpS?SH%jA_uxN($sQ-xM5-g z5f=0EZpU6h(MrhK4Hj4^Nn~+Qks5C=kCtzv!Ka(;K&5{lWJt3l4yiwl_B7CDs5*S1 zh5k9tx9s+Hs+TE2icDIo(%Bdjh5~vr5<^BnW3s+{QHme+tj^@_gyoq`e6bHJ6uO)a z)}S1gqQ55h4D1s$NAirnarpnLNBDmOy8jz?hweMThWmi)?xE({@mS?Qb(AvqvteXr_DWApo$QBfoxAFeg2bWS?k)@P*YN=N7~;7xz*r6Y{?mWi3=xfhSwnTo58oC3?t@uAPJWYKM^0x zxFb40;Q2Bd4?Ob^Zf9fu_wO{M@N))#!0e=7;Zmkwi^Jg(0pL;iu7w$y%K-kUP3@oA_;aLYsT4C-VbSt>3?NR2 zmAO7oJtcfUHBvhC-o@Bu_uT$4$gJX+vnOfWvMDbG>?K86!l5!7M~;l@FdttnYP2!+CLIpB#=t2^FR(3M9)93a

t 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 J3(q)&{s-tud7%IR diff --git a/icons/mob/species/ethereal/bodyparts.dmi b/icons/mob/species/ethereal/bodyparts.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d063c92b746728526443602088136fd4cda29a36 GIT binary patch literal 6033 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 literal 0 HcmV?d00001 diff --git a/icons/mob/species/moth/bodyparts.dmi b/icons/mob/species/moth/bodyparts.dmi new file mode 100644 index 0000000000000000000000000000000000000000..6324ad386e4c488e549639aa3ce56d48b086c8f3 GIT binary patch literal 1307 zcmV+$1?2jPP)<$0`00DGTPE!Ct z=GbNc005hMR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+H@_q!J|i_TMTv_uC9|j)q>+m=ttc@! z6~s0~Q<>yy4q`l*b+lyl#BHqQZJ|J@Idx1N9~`Z%VWtneNQlh)g0?*R|Kryn^xjIIC~rn-t#1x_i<)6_J%hEa9Z!A*)(ZjvSix>=gR zP3h`P_nH(CLsP)3pt{I(e{S|F0)s>$fkCX!=4P(~{Vb#L+Kf$pu_#^_S(L>Ij6apd zmnH?oFiFrJd@jn5jSA!@N1w)T^iiXmEQUHmXV5Lmn%}7&+HL$LPGg2)7>0QqtndFL z)x!gW6uN}5F3m#!AH}pj#@@7}6>?%S)u3^fD$Y{12jUz5zX$R=dKb4?9gP}qkt^D0 zr@-HftZHjPA1ksO|9=4M;}lKUQ8DTdM4l*|kmfL9vN5fN?(5ePtg2(?? z^#<2xxV~zEaARFH-f+!*{@+_)wTX0z&>DOFzo-5-0dF!+@cMsGeKk@2Rf_?0a(9?*{_MJNSKHJ;N{z!!S$Xyop-(&gzBp-j;V%zQb=de`oyRt_X%<7=~dO<}q+*$LHB~ggB^g zN9zfk`*R30zwhh^#5D@P))&}vyn+JXQTSuihFxxW{s*R2SUpp_Y*IjE){aaXeV8T> zml;||!2Vy7IC12y&ct4#W-sHZHJv@O7MIpl6gDgH%^GPrAA+yS_AhJb+0P~g7=~dO zhG8BGVTgT=sGW_V-*5G)lcV_&`Ioyi#0*cVIYxfp?gu8MC!CNBX-I-4fc(B~{;9x} z2#66mBuNF3-?#e#>el6mERi)IZG-U)mixD!)R7EH=d&6V?DsAAKcNC7L(oOF&H(#; zs~@n=fM&cU?{CvXY+b{M{6Vi;g5P9-b`1aUje_9MUy^|QzTFSdc3|r+<3GebwP92+ RGxGod002ovPDHLkV1jbgX?6er literal 0 HcmV?d00001 diff --git a/icons/mob/species/plasmaman/bodyparts.dmi b/icons/mob/species/plasmaman/bodyparts.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c8ee27636155b1364a9173b5598acca921c0628d GIT binary patch literal 2890 zcmcImX*io%8-6W~PQFlDq*QHVsZwgMP_e|;CH7j1pcS=mLFpuvqNJ9Nq9&A5YHXRR z&{9il8I&qMQcF;wMH;k35Mkc=_x+yhn;-9UU*}xsJ22)004qE z)+h%MJOBQULO|;<6D$A%Dc;Eyhw_WM5g8DU3kVAZfZIiR!-mkV^TPZe-4Q+BY&n_c zz@#hTJ{VKA@4d&ZBVE%M_f$qx69?|OoPDo2uy}s{VMrO@YaISQa;}c zimdvN37w5U*(c%uF|^&|8+S{YkJ51V0RU*A4a(H%b`g_?yhV4F7T73Bku4@B5<5NX z%)Tt9M1Kx+coqIaYDOHbNm81r{Dd?7$p!lyc1OK=vanStSOo5(rrtQ8@_Ha8g953s zi|EnhQ-`U{Nb$&dK8%xAq+eCrZBth1SQmJA#i)DTEgo}`+rRI{93tuScjnpS1b~ct z01$+omBD#7D;>--SjP=$zhgNTTThp_OENsPJ9jrX6(p@*>>v^d_0e=Vt)00eS% zuRg{`9xg^6pF74MT$#_3-`U@d8=Vcx9lKTMwF!6p@kP3Af2HC_u^o=%yK%^}#mvQd zy2wo63G!vsFpT}zKW=y{^(l?P=37Fq2Je&GIjQ?SkJ|UvPDM(d3tXol3-kRhH71^xwYwDkS%e&?X^|d0qc~A2$z$9RArcx zsh6K{mxfWO#=|B5nx^#oh_ur)Bk$!lEg7u%bba>nx5eA6rJ;)sA; zxH07sqD0}<M1QMA{Vs%wC!8)3E#i( zDRcdwY)8xH0Vy>2loz4M0bQVffva(*;r113s% zMq+S>gcbdaQp-ib1}=7{S*WowjOmWT8J=ilPt{1+ym=zV3lu){2joYM`R-BWCh^nO z!$8cO-e_~>%T8S&crcnab%P32Yb5myMjc8fF6%vToBk696yBFGF-j2mN=NtuU;?@} zGC<#;9jq_B1L@;Vmv-jTnlrsmc7uC?F$jDZyx(gd%nmsxFoxqS=zY^;-hdi9T{yi2Vs4Y4oyz-0$GpRdafssf1A{$HkGh-j>6yOxXllSY9zM498U=sVUEd# z(2TJ_pCX>WK9X}=7*gv40Vae2Z$X}a08P-&Wt`Ja63lOz&&lP>p{T}cBN3tY!9vyE z4Sw*{_!B`}h-?nceuomh>@c48c0^WAKK}bKyuvff$x6nPT9=LwV>1WHmkQ(Z`nK2; z^{np+%jDfyvC(8?IJTD?fBx*AEVfYV7@;hi>!_=m@wTKHVk;364HflDQ>ex*)eYvQ z-BOjbikK~{A|1DK_M~VuEAFZ6og-0#0yI*p9M)P)Ru-P|4E4FYPVvfOrE{+|^iC)< zoccp+0u5)r{g$em-+?TP5H-vc-=zoai=q?mD+~b(9v%f?z12CCHPFDIHCrp6)~r>i zHO)O3st>4od<3P~^jtm`08f-yPH%~d$h)R(Le;7DBsvLx-14s;7*VI$PI6FE!J|~X zbDD%VAA;C1P+Hxw(CE@nf-A%Vpgs&}@l{QImY+wLS1bt?!0H(jMV6QQ1$i}F`MXSl zEN=OP>sa5M`#j(zsd@3}-=6#;Mr&f0U2EMM71toFx@1FL`I^WU-bukMNc!OP$n_xr zC6m=F19?`9zGw*}Xfm9bqDKaPW|v;ICHu;*UigurH~QQIK}MFkHpp0Fp`9%}UW@bB zse0%HS)#|%$QYG(!N`M6{;Bqk8S(8gHy=FUUFVR!!*kOdNYv#AT>lABW_lv1_HHHZ zP}VMS{s>0N^44Hnz??Cm31 z@ogy4Ix$^S;+kXL841^h)iD=}ae_#ZB?FCj`t)E+Q0b*HUW~B`H?1wOyr=chO~t^s zPyHHkp_!E4`*1?O$M)`4rXsjze04J$ZIxc#vm(8qQCV|5@3G2D(*RWZO=`Wy)cmcS ztvbFRa7R$E_vmv6c6-CyYYTWS7`ZC!^vCmW;7oYHCxHeTm8JIQ# zC!@%cxZmS6AQ|BMBCT5Ogmbs?6n1*?Y<8COv`oywzEQwBMZeni@Ua?Y?e!Ga$QQg7 zg7CNhCZGRFm7kD_n@fO7P{*r}6s})$t^qJRlRMe2^Ns0QTVu8W!Ey;9rTd?m|J!Wb|?fVgOL*N9*idyc18FjmW zCe-@#bErizp>tbHpfjNH%t=VaV?qij^k6x+(X>K|^2;*^4b28vz&nHvJX=Soh2;mv z=Q_3^+3Q)$rL9Bq#&mOBaDp>EtQ>fDN`s!U1iqevT{YuuTLXT-Q~PG|9(`*!_PD8^ z#l~Y-M`!Pp11S0#aSV9Nw!N;q3*7u8=A8SinhUqc1Kn6uz#*!*wTe#?w41otT6(}O zkmqz*?;PR4EZXr@&^o1`bSJhqeUM$^fxfoh`o`^2+lg*M#SWLtEo%jiyt6p}M=IDm z9R>a$0Cr$%Eyj3>z%6r@O(D;KLyfeoY7s9_P@W)wjx|XgfFxGEisqSLslow3lj1pG zCTP)I*QS`~6}2yIwVx{`%bXs@2=9u5r0laF34It@IV19wI}(aI@V!)7l+6R<%J{aG V!(H%MkHF>_u(3d+>dm~9{sJjNNqztT literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index e4f561d5a8b..570afc6e563 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -42,6 +42,7 @@ #include "code\__DEFINES\blackmarket.dm" #include "code\__DEFINES\blob_defines.dm" #include "code\__DEFINES\blood.dm" +#include "code\__DEFINES\bodyparts.dm" #include "code\__DEFINES\botany.dm" #include "code\__DEFINES\callbacks.dm" #include "code\__DEFINES\cargo.dm" @@ -156,6 +157,7 @@ #include "code\__DEFINES\spaceman_dmm.dm" #include "code\__DEFINES\span.dm" #include "code\__DEFINES\spatial_gridmap.dm" +#include "code\__DEFINES\species_clothing_paths.dm" #include "code\__DEFINES\speech_controller.dm" #include "code\__DEFINES\stat.dm" #include "code\__DEFINES\stat_tracking.dm" @@ -271,6 +273,7 @@ #include "code\__HELPERS\atmospherics.dm" #include "code\__HELPERS\atoms.dm" #include "code\__HELPERS\bitflag_lists.dm" +#include "code\__HELPERS\bodyparts.dm" #include "code\__HELPERS\chat.dm" #include "code\__HELPERS\chat_filter.dm" #include "code\__HELPERS\clients.dm" @@ -3240,7 +3243,6 @@ #include "code\modules\mob\living\carbon\human\species_types\shadowpeople.dm" #include "code\modules\mob\living\carbon\human\species_types\skeletons.dm" #include "code\modules\mob\living\carbon\human\species_types\snail.dm" -#include "code\modules\mob\living\carbon\human\species_types\synths.dm" #include "code\modules\mob\living\carbon\human\species_types\vampire.dm" #include "code\modules\mob\living\carbon\human\species_types\zombies.dm" #include "code\modules\mob\living\silicon\damage_procs.dm" @@ -4085,6 +4087,12 @@ #include "code\modules\surgery\bodyparts\helpers.dm" #include "code\modules\surgery\bodyparts\parts.dm" #include "code\modules\surgery\bodyparts\robot_bodyparts.dm" +#include "code\modules\surgery\bodyparts\wounds.dm" +#include "code\modules\surgery\bodyparts\species_parts\ethereal_bodyparts.dm" +#include "code\modules\surgery\bodyparts\species_parts\lizard_bodyparts.dm" +#include "code\modules\surgery\bodyparts\species_parts\misc_bodyparts.dm" +#include "code\modules\surgery\bodyparts\species_parts\moth_bodyparts.dm" +#include "code\modules\surgery\bodyparts\species_parts\plasmaman_bodyparts.dm" #include "code\modules\surgery\organs\appendix.dm" #include "code\modules\surgery\organs\augments_arms.dm" #include "code\modules\surgery\organs\augments_chest.dm"