Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Adds INTJ skillchip #803

Merged
merged 1 commit into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
///Added to mob or mind, changes the icons of the fish shown in the minigame UI depending on the possible reward.
#define TRAIT_REVEAL_FISH "reveal_fish"

/// Added to a mob, allows that mob to experience flavour-based moodlets when examining food
#define TRAIT_REMOTE_TASTING "remote_tasting"

/// Stops the mob from slipping on water, or banana peels, or pretty much anything that doesn't have [GALOSHES_DONT_HELP] set
#define TRAIT_NO_SLIP_WATER "noslip_water"
/// Stops the mob from slipping on permafrost ice (not any other ice) (but anything with [SLIDE_ICE] set)
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
/obj/item/disk/nuclear/fake = 1,
/obj/item/disk/surgery/advanced_plastic_surgery = 1,
/obj/item/skillchip/brainwashing = 1,
/obj/item/skillchip/intj = 1,
/obj/item/tattoo_kit = 1,
/obj/item/folder/ancient_paperwork = 1,
) = 1,
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_REAGENT_SCANNER" = TRAIT_REAGENT_SCANNER,
"TRAIT_RECENTLY_BLOCKED_MAGIC" = TRAIT_RECENTLY_BLOCKED_MAGIC,
"TRAIT_RELAYING_ATTACKER" = TRAIT_RELAYING_ATTACKER,
"TRAIT_REMOTE_TASTING" = TRAIT_REMOTE_TASTING,
"TRAIT_RESEARCH_SCANNER" = TRAIT_RESEARCH_SCANNER,
"TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD,
"TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT,
Expand Down
10 changes: 10 additions & 0 deletions code/datums/components/food/edible.dm
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,16 @@ Behavior that's still missing from this component that original food items had t
for(var/datum/reagent/reagent as anything in owner.reagents.reagent_list)
examine_list += span_notice("- [reagent.name] [reagent.volume]u: [round(reagent.purity * 100)]% pure")

if(!HAS_TRAIT(user, TRAIT_REMOTE_TASTING))
return
var/fraction = min(bite_consumption / owner.reagents.total_volume, 1)
checkLiked(fraction, user)
if (!owner.reagents.get_reagent_amount(/datum/reagent/consumable/salt))
examine_list += span_notice("It could use a little more Sodium Chloride...")
if (isliving(user))
var/mob/living/living_user = user
living_user.taste(owner.reagents)

/datum/component/edible/proc/UseFromHand(obj/item/source, mob/living/M, mob/living/user)
SIGNAL_HANDLER

Expand Down
9 changes: 9 additions & 0 deletions code/modules/library/skill_learning/skillchip.dm
Original file line number Diff line number Diff line change
Expand Up @@ -498,4 +498,13 @@
activate_message = span_notice("You feel the knowledge and passion of several sunbaked, seasoned fishermen burn within you.")
deactivate_message = span_notice("You no longer feel like casting a fishing rod by the sunny riverside.")

/obj/item/skillchip/intj
name = "Integrated Intuitive Thinking and Judging skillchip"
auto_traits = list(TRAIT_REMOTE_TASTING)
skill_name = "Mental Flavour Calculus"
skill_description = "When examining food, you can experience the flavours just as well as if you were eating it."
skill_icon = FA_ICON_DRUMSTICK_BITE
activate_message = span_notice("You think of your favourite food and realise that you can rotate its flavour in your mind.")
deactivate_message = span_notice("You feel your food-based mind palace crumbling...")

#undef SKILLCHIP_CATEGORY_GENERAL
1 change: 1 addition & 0 deletions code/modules/mob/living/brain/brain_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@
desc = "A piece of juicy meat found in an ayy lmao's head."
icon_state = "brain-x"
brain_size = 1.3
organ_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, TRAIT_LITERATE, TRAIT_REMOTE_TASTING)

////////////////////////////////////TRAUMAS////////////////////////////////////////

Expand Down
11 changes: 6 additions & 5 deletions code/modules/mob/living/carbon/human/species_types/abductors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
id = SPECIES_ABDUCTOR
sexes = FALSE
inherent_traits = list(
TRAIT_NO_UNDERWEAR,
TRAIT_CHUNKYFINGERS_IGNORE_BATON,
TRAIT_NEVER_WOUNDED,
TRAIT_NOBLOOD,
TRAIT_NOBREATH,
TRAIT_NODISMEMBER,
TRAIT_NOHUNGER,
TRAIT_NO_UNDERWEAR,
TRAIT_REMOTE_TASTING,
TRAIT_VIRUSIMMUNE,
TRAIT_NOBLOOD,
TRAIT_CHUNKYFINGERS_IGNORE_BATON,
TRAIT_NODISMEMBER,
TRAIT_NEVER_WOUNDED
)
mutanttongue = /obj/item/organ/internal/tongue/abductor
mutantstomach = null
Expand Down
11 changes: 9 additions & 2 deletions code/modules/power/supermatter/supermatter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,15 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
/obj/machinery/power/supermatter_crystal/examine(mob/user)
. = ..()
var/immune = HAS_MIND_TRAIT(user, TRAIT_MADNESS_IMMUNE)
if(isliving(user) && !immune && (get_dist(user, src) < SM_HALLUCINATION_RANGE(internal_energy)))
. += span_danger("You get headaches just from looking at it.")
if(isliving(user))
if (!immune && (get_dist(user, src) < SM_HALLUCINATION_RANGE(internal_energy)))
. += span_danger("You get headaches just from looking at it.")
var/mob/living/living_user = user
if (HAS_TRAIT(user, TRAIT_REMOTE_TASTING))
to_chat(user, span_warning("The taste is overwhelming and indescribable!"))
living_user.electrocute_act(shock_damage = 15, source = src, flags = SHOCK_KNOCKDOWN | SHOCK_NOGLOVES)
. += span_notice("It could use a little more Sodium Chloride...")

. += delamination_strategy.examine(src)
return .

Expand Down
5 changes: 4 additions & 1 deletion code/modules/reagents/reagent_containers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,16 @@
reagents.add_reagent(/datum/reagent/blood, disease_amount, data)
add_initial_reagents()

/obj/item/reagent_containers/examine()
/obj/item/reagent_containers/examine(mob/user)
. = ..()
if(has_variable_transfer_amount)
if(possible_transfer_amounts.len > 1)
. += span_notice("Left-click or right-click in-hand to increase or decrease its transfer amount.")
else if(possible_transfer_amounts.len)
. += span_notice("Left-click or right-click in-hand to view its transfer amount.")
if(isliving(user) && HAS_TRAIT(user, TRAIT_REMOTE_TASTING))
var/mob/living/living_user = user
living_user.taste(reagents)

/obj/item/reagent_containers/create_reagents(max_vol, flags)
. = ..()
Expand Down
3 changes: 2 additions & 1 deletion code/modules/vending/games.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@
/obj/item/skillchip/appraiser = 2,
/obj/item/skillchip/basketweaving = 2,
/obj/item/skillchip/bonsai = 2,
/obj/item/skillchip/intj = 2,
/obj/item/skillchip/light_remover = 2,
/obj/item/skillchip/master_angler = 2,
/obj/item/skillchip/sabrage = 2,
/obj/item/skillchip/useless_adapter = 5,
/obj/item/skillchip/wine_taster = 2,
/obj/item/skillchip/master_angler = 2,
),
),
list(
Expand Down
Loading