From d6ea007a378c4d8b3848e0e530289f1ddc07c9e0 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 9 Mar 2021 07:06:13 +0100 Subject: [PATCH] Removing comments --- code/modules/client/preference_setup/vore/07_traits.dm | 4 ++-- .../carbon/human/species/shadekin/shadekin_abilities.dm | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 72b330bac5b..5a7c83ed8ac 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -342,11 +342,11 @@ if(pref.species in instance.banned_species) alert("The trait you've selected cannot be taken by the species you've chosen!","Error") return TOPIC_REFRESH - //VORSTATION ADDITION CHOMPADDITION START Adding whitelist for traits + if( LAZYLEN(instance.allowed_species) && !(pref.species in instance.allowed_species)) //Adding white list handling -shark alert("The trait you've selected cannot be taken by the species you've chosen!","Error") return TOPIC_REFRESH - //VORSTATION ADDITION CHOMPADDITION END + if(trait_choice in pref.pos_traits + pref.neu_traits + pref.neg_traits) conflict = instance.name diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index a924e5768af..e465ff4772b 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -33,7 +33,6 @@ var/ability_cost = 100 -//CHOMPADDITION Conditional shifting ased on observers and darkness var/darkness = 1 var/turf/T = get_turf(src) if(!T) @@ -52,7 +51,7 @@ ability_cost = ability_cost + ( 15 * watcher ) if(!(ability_flags & AB_PHASE_SHIFTED)) log_debug("[src] attempted to shift with [watcher] visible Carbons with a cost of [ability_cost] in a darkness level of [darkness]") -//CHOMPADDITION END + var/datum/species/shadekin/SK = species if(!istype(SK)) to_chat(src, "Only a shadekin can use that!")