From 643ca84dacdb886c008f3bedf9dbfb36f39382f5 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Wed, 14 Jul 2021 09:56:54 -0500 Subject: [PATCH] Adds the tie hair inherent verb to all species Fixed the fact that Zorren had inherent verbs defined twice for them --- .../carbon/human/species/station/alraune.dm | 4 +-- .../carbon/human/species/station/blank_vr.dm | 1 + .../species/station/station_special_vr.dm | 6 ++-- .../human/species/station/station_vr.dm | 28 ++++++++++++------- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 2cb0b357fb1..189eeb425d5 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -45,8 +45,8 @@ flags = NO_SCAN | IS_PLANT | NO_MINOR_CUT appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR - inherent_verbs = list( - /mob/living/carbon/human/proc/alraune_fruit_select) //Give them the voremodes related to wrapping people in vines and sapping their fluids + inherent_verbs = list(/mob/living/carbon/human/proc/alraune_fruit_select, //Give them the voremodes related to wrapping people in vines and sapping their fluids + /mob/living/carbon/human/proc/tie_hair) color_mult = 1 icobase = 'icons/mob/human_races/r_human_vr.dmi' diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index fe8d8ecb687..7f5cb249890 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -22,6 +22,7 @@ health_hud_intensity = 2 num_alternate_languages = 3 assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) genders = list(MALE, FEMALE, PLURAL, NEUTER) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index a549049e2ad..4d766fb837a 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -27,7 +27,8 @@ /mob/living/carbon/human/proc/sonar_ping, /mob/living/carbon/human/proc/tie_hair, /mob/living/proc/flying_toggle, - /mob/living/proc/start_wings_hovering) //Xenochimera get all the special verbs since they can't select traits. + /mob/living/proc/start_wings_hovering, + /mob/living/carbon/human/proc/tie_hair) //Xenochimera get all the special verbs since they can't select traits. virus_immune = 1 // They practically ARE one. min_age = 18 @@ -334,7 +335,8 @@ /mob/living/carbon/human/proc/toggle_silk_production, /mob/living/carbon/human/proc/weave_structure, /mob/living/carbon/human/proc/weave_item, - /mob/living/carbon/human/proc/set_silk_color) + /mob/living/carbon/human/proc/set_silk_color, + /mob/living/carbon/human/proc/tie_hair) min_age = 18 max_age = 80 diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index a7f55d937a6..b6b54634055 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -15,6 +15,7 @@ secondary_langs = list(LANGUAGE_SAGARU) name_language = LANGUAGE_SAGARU color_mult = 1 + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) min_age = 18 max_age = 80 @@ -80,7 +81,7 @@ name_language = LANGUAGE_SKRELLIAN color_mult = 1 assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) - + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) min_age = 18 max_age = 80 @@ -127,8 +128,9 @@ secondary_langs = list(LANGUAGE_BIRDSONG) name_language = LANGUAGE_BIRDSONG color_mult = 1 - inherent_verbs = list(/mob/living/proc/flying_toggle,/mob/living/proc/start_wings_hovering) - + inherent_verbs = list(/mob/living/proc/flying_toggle, + /mob/living/proc/start_wings_hovering, + /mob/living/carbon/human/proc/tie_hair) min_age = 18 max_age = 80 @@ -169,7 +171,9 @@ num_alternate_languages = 3 secondary_langs = list(LANGUAGE_TERMINUS) name_language = LANGUAGE_TERMINUS - inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds) + inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, + /mob/living/proc/shred_limb, + /mob/living/carbon/human/proc/tie_hair) min_age = 18 max_age = 80 @@ -201,7 +205,6 @@ "You feel uncomfortably warm.", "Your overheated skin itches." ) - inherent_verbs = list(/mob/living/proc/shred_limb) /datum/species/vulpkanin name = SPECIES_VULPKANIN @@ -220,7 +223,8 @@ // gluttonous = 1 num_alternate_languages = 3 color_mult = 1 - inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds) + inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, + /mob/living/carbon/human/proc/tie_hair) blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ @@ -253,6 +257,7 @@ tail_animation = 'icons/mob/species/unathi/tail_vr.dmi' color_mult = 1 min_age = 18 + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) gluttonous = 0 genders = list(MALE, FEMALE, PLURAL, NEUTER) descriptors = list() @@ -265,6 +270,7 @@ tail_animation = 'icons/mob/species/tajaran/tail_vr.dmi' color_mult = 1 min_age = 18 + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) allergens = null gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds) @@ -279,6 +285,7 @@ deform = 'icons/mob/human_races/r_def_skrell_vr.dmi' color_mult = 1 min_age = 18 + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) reagent_tag = null allergens = null assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) @@ -288,6 +295,7 @@ /datum/species/zaddat spawn_flags = SPECIES_CAN_JOIN min_age = 18 + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) //I don't even know if Zaddat can HAVE hair, but here we are, I suppose gluttonous = 0 genders = list(MALE, FEMALE, PLURAL, NEUTER) descriptors = list() @@ -328,7 +336,8 @@ /datum/species/vox gluttonous = 0 spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE - min_age = 18 + min_age = 18 + inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) //Get ya quills done did icobase = 'icons/mob/human_races/r_vox_old.dmi' deform = 'icons/mob/human_races/r_def_vox_old.dmi' descriptors = list( @@ -349,7 +358,7 @@ name_language = null color_mult = 1 genders = list(MALE, FEMALE, PLURAL, NEUTER) - inherent_verbs = list(/mob/living/proc/flying_toggle,/mob/living/proc/start_wings_hovering) + inherent_verbs = list(/mob/living/proc/flying_toggle,/mob/living/proc/start_wings_hovering,/mob/living/carbon/human/proc/tie_hair) min_age = 18 max_age = 80 @@ -496,7 +505,7 @@ num_alternate_languages = 3 secondary_langs = list(LANGUAGE_TERMINUS) name_language = LANGUAGE_TERMINUS - inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds) + inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds,/mob/living/proc/shred_limb,/mob/living/carbon/human/proc/tie_hair) min_age = 18 max_age = 80 @@ -510,7 +519,6 @@ base_color = "#333333" blood_color = "#240bc4" color_mult = 1 - inherent_verbs = list(/mob/living/proc/shred_limb) heat_discomfort_strings = list( "Your fur prickles in the heat.",