Skip to content

Bitchin [WIP] #4

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

Draft
StiffRobot wants to merge 2 commits into
base: nocs-a-petty-bitch-(or,-lore-accurate-magick)
Choose a base branch
from
Draft

Bitchin [WIP] #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57856e2
cleanup
StiffRobot Aug 12, 2025
9a0206c
Acryne -> Arcyne
StiffRobot Aug 12, 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
4 changes: 3 additions & 1 deletion code/__DEFINES/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_OLDPARTY "Old Party"
#define TRAIT_EARGRAB "Ear Grab"
#define TRAIT_FACELESS "Faceless One"
#define TRAIT_POST_GRADUATE "Doctorate in the Acryne" //Acryne magick traits. you can only use the arcyne if you got one of these.

// ARCYNE MAGIC TRAITS. You can only use the arcyne if you got one of these.
#define TRAIT_POST_GRADUATE "Doctorate in the Arcyne"
#define TRAIT_GRADUATE "Graduate of the Arcyne"
#define TRAIT_BACHLOR "Bachlors of the Arcyne"
#define TRAIT_ARCYNE_STUDENT "Student of the Arcyne"
Expand Down
44 changes: 23 additions & 21 deletions code/_globalvars/special_traits/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,27 +558,29 @@
character.mind.special_items["Merchant Key"] = /obj/item/key/merchant
character.mind.special_items["GOLDFACE Gem"] = /obj/item/gem_device/goldface

// /datum/special_trait/thinker //Commenting it out because mages should *really* not be in this sort of position, nor should they have these stats.
// name = "The Thinker"
// greet_text = span_notice("Physique, Endurance, Constitution. The trinity of what builds a great leader and an even greater kingdom... or whatever those nimrods were yapping about! <b>I cast FIREBALL!!!</b>")
// req_text = "Monarch, worship Noc or Zizo"
// allowed_patrons = list(/datum/patron/divine/noc, /datum/patron/inhumen/zizo)
// allowed_jobs = list(/datum/job/lord)
// weight = 25 //Should be fine.

// /datum/special_trait/thinker/on_apply(mob/living/carbon/human/character, silent
// character.change_stat("strength", -3)
// character.change_stat("intelligence", 6)
// character.change_stat("constitution", -1)
// character.change_stat("endurance", -1)
// character.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE)
// character.set_skillrank(/datum/skill/combat/swords, 2, TRUE) //Average only.
// character.adjust_spellpoints(14) //Less points than Court Mage, why do Court mage get 17 points? what even?
// character.add_spell(/datum/action/cooldown/spell/undirected/touch/prestidigitation, silent = TRUE)
// character.generate_random_attunements(rand(4,6))
// character.mana_pool.set_intrinsic_recharge(MANA_ALL_LEYLINES)
// character.mana_pool.adjust_mana(100) //I don't know, they don't spawn with their full mana bar, so we give them a bit more mana at the start.
// new /obj/item/book/granter/spellbook/master(get_turf(character))
/*
/datum/special_trait/thinker //Commenting it out because mages should *really* not be in this sort of position, nor should they have these stats.
name = "The Thinker"
greet_text = span_notice("Physique, Endurance, Constitution. The trinity of what builds a great leader and an even greater kingdom... or whatever those nimrods were yapping about! <b>I cast FIREBALL!!!</b>")
req_text = "Monarch, worship Noc or Zizo"
allowed_patrons = list(/datum/patron/divine/noc, /datum/patron/inhumen/zizo)
allowed_jobs = list(/datum/job/lord)
weight = 25 //Should be fine.

/datum/special_trait/thinker/on_apply(mob/living/carbon/human/character, silent
character.change_stat("strength", -3)
character.change_stat("intelligence", 6)
character.change_stat("constitution", -1)
character.change_stat("endurance", -1)
character.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE)
character.set_skillrank(/datum/skill/combat/swords, 2, TRUE) //Average only.
character.adjust_spellpoints(14) //Less points than Court Mage, why do Court mage get 17 points? what even?
character.add_spell(/datum/action/cooldown/spell/undirected/touch/prestidigitation, silent = TRUE)
character.generate_random_attunements(rand(4,6))
character.mana_pool.set_intrinsic_recharge(MANA_ALL_LEYLINES)
character.mana_pool.adjust_mana(100) //I don't know, they don't spawn with their full mana bar, so we give them a bit more mana at the start.
new /obj/item/book/granter/spellbook/master(get_turf(character))
*/

/datum/special_trait/skeleton
name = "Skeleton"
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"Loved By Kittens" = TRAIT_KITTEN_MOM,
"Waterbreathing" = TRAIT_WATER_BREATHING,
"Moonwater Elixir" = TRAIT_MOONWATER_ELIXIR,
"Doctorate of the Acryne" = TRAIT_POST_GRADUATE,
"Doctorate of the Arcyne" = TRAIT_POST_GRADUATE,
"Graduate of the Arcyne" = TRAIT_GRADUATE,
"Bachlors of the Arcyne" = TRAIT_BACHLOR,
"Student of the Arcyne" = TRAIT_ARCYNE_STUDENT,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/spellbook.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
var/datum/mind/user_mind = user.mind
if(!user_mind) return // How??
if(user_mind.has_changed_spell)
to_chat(user, span_warning("I have already unbinded my spells today!"))
to_chat(user, span_warning("I have already unbound my spells today!"))
return
var/list/resettable_spells = list()
var/list/spell_list = user_mind.spell_list
Expand Down