Consistency pass on spell invocations (punctuation) (#90386)

## About The Pull Request Recent events on the station have left me very - unimpressed, as it comes to our spells. Some have backticks, most use apostrophes. Some have punctuation, many don't. Some are in all caps, others aren't. So I went through and basically just tweaked all the invocations slightly to make them more consistent. They're all punctuated now, with whispered invocations preferring periods and shouting invocations preferring exclamation (though this is not a set rule, as sometimes a period gets the message across stronger than an exclamation point." I also made it a bit easier to work with emote invocations. Which in turn involved me touching the human `p_x` procs. ## Why It's Good For The Game Spell invocations are wildly inconsistent style wise, tightening them up helps towards muh immersions. Makes it feel more like a system and less like stuff thrown together. ## Changelog 🆑 Melbert qol: All spell invocations have been made a bit more consistent - some have changed slightly, some are now punctuated. "Dragon Form" and "Bear Form" are now emotes invocations. qol: "Unknown" mobs are now properly referred to as they/them /🆑
2026-08-28 15:47:15 +01:00 · 2025-04-03 02:04:45 +02:00
parent e9d77fe358
commit 331a6bfc9a
46 changed files with 83 additions and 120 deletions
@@ -404,7 +404,11 @@
 				invoker.whisper(used_invocation_message, forced = "spell ([src])")

 		if(INVOCATION_EMOTE)
-			invoker.visible_message(used_invocation_message, invocation_self_message)
+			invoker.visible_message(
+				capitalize(REPLACE_PRONOUNS(replacetext(used_invocation_message, "%CASTER", invoker.name), invoker)),
+				capitalize(REPLACE_PRONOUNS(replacetext(invocation_self_message, "%CASTER", invoker.name), invoker)),
+				visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE,
+			)

 /// Checks if the current OWNER of the spell is in a valid state to say the spell's invocation
 /datum/action/cooldown/spell/proc/try_invoke(mob/living/invoker, feedback = TRUE)
@@ -8,7 +8,7 @@
 	cooldown_time = 10 SECONDS
 	cooldown_reduction_per_rank = 2 SECONDS

-	invocation = "AULIE OXIN FIERA"
+	invocation = "AULIE OXIN FIERA!"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC
 	aoe_radius = 3
@@ -8,7 +8,7 @@
 	cooldown_time = 20 SECONDS
 	cooldown_reduction_per_rank = 3.5 SECONDS

-	invocation = "FORTI GY AMA"
+	invocation = "FORTI GY AMA!"
 	invocation_type = INVOCATION_SHOUT

 	aoe_radius = 7
@@ -76,7 +76,7 @@
 	sound = 'sound/effects/magic/repulse.ogg'

 	school = SCHOOL_EVOCATION
-	invocation = "GITTAH WEIGH"
+	invocation = "GITTAH WEIGH!"
 	invocation_type = INVOCATION_SHOUT
 	aoe_radius = 5

@@ -7,7 +7,7 @@
 	school = SCHOOL_EVOCATION
 	cooldown_time = 6 SECONDS

-	invocation = "FI'RAN DADISKO"
+	invocation = "FI'RAN DADISKO!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC

@@ -10,7 +10,7 @@
 	cooldown_time = 1 MINUTES
 	cooldown_reduction_per_rank = 10 SECONDS

-	invocation = "NOT THE BEES"
+	invocation = "NOT THE BEES!"
 	invocation_type = INVOCATION_SHOUT

 	summon_radius = 3
@@ -6,7 +6,7 @@
 	school = SCHOOL_CONJURATION
 	cooldown_time = 2 MINUTES

-	invocation = "NOUK FHUNMM SACP RISSKA"
+	invocation = "NOUK FHUNMM SACP RISSKA!"
 	invocation_type = INVOCATION_SHOUT

 	summon_radius = 1
@@ -8,7 +8,7 @@
 	cooldown_time = 1 MINUTES
 	spell_requirements = null

-	invocation = "PL`YR DOT PL`CTM` OOO`BEE G" //player.placeatme 00064B33 9
+	invocation = "PL'YR DOT PL'CTM' OOO'BEE G!" //player.placeatme 00064B33 9
 	invocation_type = INVOCATION_SHOUT
 	garbled_invocation_prob = 0 //i'd rather it remain like this

@@ -6,7 +6,7 @@
 	school = SCHOOL_CONJURATION
 	cooldown_time = 2 MINUTES

-	invocation = "IA IA"
+	invocation = "IA IA!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE

@@ -11,7 +11,7 @@

 	school = SCHOOL_MIME
 	cooldown_time = 30 SECONDS
-	invocation = "Someone does a weird gesture." // Overriden in before cast
+	invocation = span_notice("<b>%CASTER</b> pulls out an invisible chair and sits down.")
 	invocation_self_message = span_notice("You conjure an invisible chair and sit down.")
 	invocation_type = INVOCATION_EMOTE

@@ -23,10 +23,6 @@
 	summon_type = list(/obj/structure/chair/mime)
 	summon_lifespan = 25 SECONDS

-/datum/action/cooldown/spell/conjure/invisible_chair/before_cast(atom/cast_on)
-	. = ..()
-	invocation = span_notice("<b>[cast_on]</b> pulls out an invisible chair and sits down.")
-
 /datum/action/cooldown/spell/conjure/invisible_chair/post_summon(atom/summoned_object, mob/living/carbon/human/cast_on)
 	if(!isobj(summoned_object))
 		return
@@ -11,7 +11,7 @@

 	school = SCHOOL_MIME
 	cooldown_time = 30 SECONDS
-	invocation = "Someone does a weird gesture." // Overriden in before cast
+	invocation = span_notice("<b>%CASTER</b> looks as if a wall is in front of %PRONOUN_them.")
 	invocation_self_message = span_notice("You form a wall in front of yourself.")
 	invocation_type = INVOCATION_EMOTE

@@ -22,7 +22,3 @@
 	summon_radius = 0
 	summon_type = list(/obj/effect/forcefield/mime)
 	summon_lifespan = 30 SECONDS
-
-/datum/action/cooldown/spell/conjure/invisible_wall/before_cast(atom/cast_on)
-	. = ..()
-	invocation = span_notice("<b>[cast_on]</b> looks as if a wall is in front of [cast_on.p_them()].")
@@ -6,7 +6,7 @@
 	button_icon_state = "nether"
 	cooldown_time = 1 MINUTES
 	cooldown_reduction_per_rank = 10 SECONDS
-	invocation = "FL'NT N' ST'L"
+	invocation = "FL'NT N' ST'L!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 	summon_radius = 1
@@ -6,7 +6,7 @@
 	cooldown_time = 1 MINUTES
 	cooldown_reduction_per_rank = 13.75 SECONDS

-	invocation = "HO HO HO"
+	invocation = "HO HO HO!"
 	invocation_type = INVOCATION_SHOUT

 	summon_radius = 3
@@ -6,7 +6,7 @@
 	cooldown_time = 25 SECONDS
 	cooldown_reduction_per_rank = 5 SECONDS

-	invocation = "CAVERE INSIDIAS"
+	invocation = "CAVERE INSIDIAS!"
 	invocation_type = INVOCATION_SHOUT

 	summon_radius = 3
@@ -13,7 +13,7 @@

 	school = SCHOOL_MIME
 	cooldown_time = 30 SECONDS
-	invocation = "Someone does a weird gesture." // Overriden in before cast
+	invocation = span_notice("<b>%CASTER</b> moves %PRONOUN_their hands in the shape of a box, pressing a box out of the air.")
 	invocation_self_message = span_notice("You conjure up an invisible box, large enough to store a few things.")
 	invocation_type = INVOCATION_EMOTE

@@ -26,10 +26,6 @@
 	/// How long boxes last before going away
 	var/box_lifespan = 50 SECONDS

-/datum/action/cooldown/spell/conjure_item/invisible_box/before_cast(atom/cast_on)
-	. = ..()
-	invocation = span_notice("<b>[cast_on]</b> moves [cast_on.p_their()] hands in the shape of a cube, pressing a box out of the air.")
-
 /datum/action/cooldown/spell/conjure_item/invisible_box/make_item(atom/caster)
 	. = ..()
 	var/obj/item/made_box = .
@@ -9,7 +9,7 @@
 	cooldown_time = 30 SECONDS
 	cooldown_reduction_per_rank = 6.25 SECONDS

-	invocation = "STI KALY"
+	invocation = "STI KALY."
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC

@@ -13,9 +13,9 @@
 	school = SCHOOL_MIME
 	cooldown_time = 30 SECONDS

-	invocation = ""
-	invocation_type = INVOCATION_EMOTE
+	invocation = span_notice("<b>%CASTER</b> fires %PRONOUN_their finger gun!")
 	invocation_self_message = span_danger("You fire your finger gun!")
+	invocation_type = INVOCATION_EMOTE

 	spell_requirements = SPELL_REQUIRES_HUMAN|SPELL_REQUIRES_MIME_VOW
 	antimagic_flags = NONE
@@ -43,10 +43,3 @@
 			return FALSE

 	return ..()
-
-/datum/action/cooldown/spell/pointed/projectile/finger_guns/before_cast(atom/cast_on)
-	. = ..()
-	if(isnull(owner))
-		invocation = initial(invocation)
-	else
-		invocation = span_notice("<b>[owner]</b> fires [owner.p_their()] finger gun!")
@@ -11,7 +11,7 @@
 	antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND
 	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_PHASED|AB_CHECK_OPEN_TURF

-	invocation = "GIN'YU CAPAN"
+	invocation = "GIN'YU CAPAN."
 	invocation_type = INVOCATION_WHISPER
 	antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND

@@ -10,7 +10,7 @@
 	cooldown_time = 60 SECONDS
 	cooldown_reduction_per_rank = 5 SECONDS

-	invocation = "DIRI CEL"
+	invocation = "Diri Cel!"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC

@@ -23,7 +23,7 @@
 	cooldown_time = 40 SECONDS
 	cooldown_reduction_per_rank = 5 SECONDS

-	invocation = "NEC CANTIO"
+	invocation = "NEC CANTIO!"
 	invocation_type = INVOCATION_SHOUT

 	emp_heavy = 6
@@ -8,7 +8,7 @@
 	cooldown_time = 10 SECONDS
 	cooldown_reduction_per_rank = 1.25 SECONDS

-	invocation = "TARCOL MINTI ZHERI"
+	invocation = "TARCOL MINTI ZHERI!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC

@@ -59,13 +59,9 @@
 	spell_requirements = SPELL_REQUIRES_HUMAN|SPELL_REQUIRES_MIME_VOW
 	antimagic_flags = NONE

-	invocation = ""
-	invocation_type = INVOCATION_EMOTE
+	invocation = span_notice("<b>%CASTER</b> looks as if a blockade is in front of %PRONOUN_them.")
 	invocation_self_message = span_notice("You form a blockade in front of yourself.")
+	invocation_type = INVOCATION_EMOTE
 	spell_max_level = 1

 	wall_type = /obj/effect/forcefield/mime/advanced
-
-/datum/action/cooldown/spell/forcewall/mime/before_cast(atom/cast_on)
-	. = ..()
-	invocation = span_notice("<b>[cast_on]</b> looks as if a blockade is in front of [cast_on.p_them()].")
@@ -43,7 +43,7 @@
 	cooldown_reduction_per_rank = 5 SECONDS
 	spell_max_level = 3

-	invocation = "BIRUZ BENNAR"
+	invocation = "BIRUZ BENNAR!"
 	invocation_type = INVOCATION_SHOUT

 	mutations_to_add = list(/datum/mutation/human/laser_eyes, /datum/mutation/human/hulk/wizardly, /datum/mutation/human/gigantism)
@@ -15,7 +15,7 @@
 	cooldown_time = 60 SECONDS
 	cooldown_reduction_per_rank = 10 SECONDS

-	invocation = "SHAPSDAY"
+	invocation = "SHAPSDAY."
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC

@@ -6,7 +6,7 @@
 	school = SCHOOL_TRANSMUTATION
 	cooldown_time = 10 SECONDS

-	invocation = "GAR YOK"
+	invocation = "Gar Yok!"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC

@@ -2,8 +2,9 @@
 /datum/action/cooldown/spell/shapeshift/dragon
 	name = "Dragon Form"
 	desc = "Take on the shape a lesser ash drake."
-	invocation = "RAAAAAAAAWR!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = span_danger("<b>%CASTER</b> lets out a mighty roar!")
+	invocation_self_message = span_danger("You let out a mighty roar!")
+	invocation_type = INVOCATION_EMOTE
 	spell_requirements = NONE

 	possible_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser)
@@ -1,8 +1,9 @@
 /datum/action/cooldown/spell/shapeshift/polar_bear
 	name = "Polar Bear Form"
 	desc = "Take on the shape of a polar bear."
-	invocation = "RAAAAAAAAWR!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = span_danger("<b>%CASTER</b> lets out a mighty roar!")
+	invocation_self_message = span_danger("You let out a mighty roar!")
+	invocation_type = INVOCATION_EMOTE
 	spell_requirements = NONE

 	possible_shapes = list(/mob/living/simple_animal/hostile/asteroid/polarbear/lesser)
@@ -10,7 +10,7 @@
 	cooldown_reduction_per_rank = 20 SECONDS
 	spell_max_level = 3

-	invocation = "SCYAR NILA"
+	invocation = "SCYAR NILA" // gets punctuation auto applied
 	invocation_type = INVOCATION_SHOUT

 	smoke_type = /datum/effect_system/fluid_spread/smoke