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.

Sign up for GitHub

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

Adds mana-based Telepathy. #650

Merged
merged 5 commits into from
Feb 19, 2025
+28 −0
Merged

Adds mana-based Telepathy. #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bac76a
adds all relevant content
Wollywoger Jan 24, 2025
09d6e5e
Merge branch 'MrMelbert:master' into mana-based-communication
Wollywoger Jan 25, 2025
481d29c
reduces the cost after consideration
Wollywoger Jan 25, 2025
f64a221
Merge branch 'mana-based-communication' of https://www.github.com/wol…
Wollywoger Jan 25, 2025
e6b0e3b
Merge branch 'master' into mana-based-communication
Wollywoger Jan 25, 2025
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
1 change: 1 addition & 0 deletions maplestation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6435,6 +6435,7 @@
#include "maplestation_modules\code\modules\magic\story_spells\mana_sense.dm"
#include "maplestation_modules\code\modules\magic\story_spells\shock_touch.dm"
#include "maplestation_modules\code\modules\magic\story_spells\soothe.dm"
#include "maplestation_modules\code\modules\magic\story_spells\telepathy.dm"
#include "maplestation_modules\code\modules\magic\story_spells\thaumatergic_sense.dm"
#include "maplestation_modules\code\modules\magic\story_spells\water_control.dm"
#include "maplestation_modules\code\modules\magic\story_spells\components\story_spell_component.dm"
Expand Down
10 changes: 10 additions & 0 deletions maplestation_modules/code/modules/client/preferences/spellbook/items/spellbook_item_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,13 @@ GLOBAL_LIST_INIT(spellbook_misc_items, generate_spellbook_items(SPELLBOOK_CATEGO
category = SPELLBOOK_CATEGORY_MISC

our_action_typepath = /datum/action/cooldown/spell/pointed/mana_sense

/datum/spellbook_item/spell/sending
name = "Sending"
description = "Its Telepathy, but with magic."
lore = "Using your magical attunement (or other aptitudes) \
you can send a message to another creature within a short radius. "

category = SPELLBOOK_CATEGORY_MISC

our_action_typepath = /datum/action/cooldown/spell/list_target/telepathy/mana
17 changes: 17 additions & 0 deletions maplestation_modules/code/modules/magic/story_spells/telepathy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#define SENDING_MANA_COST 7

/datum/action/cooldown/spell/list_target/telepathy/mana
name = "Sending"
desc = "Using mana, telepathically transmits a message to the target."
var/mana_cost = SENDING_MANA_COST

/datum/action/cooldown/spell/list_target/telepathy/mana/New(Target, original)
. = ..()

AddComponent(/datum/component/uses_mana/spell, \
activate_check_failure_callback = CALLBACK(src, PROC_REF(spell_cannot_activate)), \
get_user_callback = CALLBACK(src, PROC_REF(get_owner)), \
mana_required = mana_cost, \
)

#undef SENDING_MANA_COST
Loading