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

[TG Mirror] Heretic summon name fixes #140

Merged
merged 1 commit into from
Oct 19, 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
2 changes: 1 addition & 1 deletion code/modules/antagonists/heretic/heretic_knowledge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@
animate(summoned, 10 SECONDS, alpha = 155)

message_admins("A [summoned.name] is being summoned by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(summoned)].")
var/list/mob/dead/observer/candidates = poll_candidates_for_mob("Do you want to play as a [summoned.real_name]?", ROLE_HERETIC, FALSE, 10 SECONDS, summoned, poll_ignore_define)
var/list/mob/dead/observer/candidates = poll_candidates_for_mob("Do you want to play as a [summoned.name]?", ROLE_HERETIC, FALSE, 10 SECONDS, summoned, poll_ignore_define)
if(!LAZYLEN(candidates))
loc.balloon_alert(user, "ritual failed, no ghosts!")
animate(summoned, 0.5 SECONDS, alpha = 0)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/heretic/ash_spirit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Player-only mob which is fast, can jaunt a short distance, and is dangerous at close range
*/
/mob/living/basic/heretic_summon/ash_spirit
name = "Ash Spirit"
name = "\improper Ash Spirit"
real_name = "Ashy"
desc = "A manifestation of ash, trailing a perpetual cloud of short-lived cinders."
icon_state = "ash_walker"
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob/living/basic/heretic/fire_shark.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/heretic_summon/fire_shark
name = "fire shark"
name = "\improper Fire Shark"
real_name = "Fire Shark"
desc = "It is a eldritch dwarf space shark, also known as a fire shark."
icon_state = "fire_shark"
icon_living = "fire_shark"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/heretic/flesh_stalker.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// Durable ambush mob with an EMP ability
/mob/living/basic/heretic_summon/stalker
name = "Flesh Stalker"
name = "\improper Flesh Stalker"
real_name = "Flesh Stalker"
desc = "An abomination cobbled together from varied remains. Its appearance changes slightly every time you blink."
icon_state = "stalker"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// Scout and assassin who can appear and disappear from glass surfaces. Damaged by being examined.
/mob/living/basic/heretic_summon/maid_in_the_mirror
name = "Maid in the Mirror"
name = "\improper Maid in the Mirror"
real_name = "Maid in the Mirror"
desc = "A floating and flowing wisp of chilled air. Glancing at it causes it to shimmer slightly."
icon = 'icons/mob/simple/mob.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/heretic/raw_prophet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* It can blind people to make a getaway, but also get stronger if it attacks the same target consecutively.
*/
/mob/living/basic/heretic_summon/raw_prophet
name = "Raw Prophet"
name = "\improper Raw Prophet"
real_name = "Raw Prophet"
desc = "An abomination stitched together from a few severed arms and one swollen, orphaned eye."
icon_state = "raw_prophet"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/heretic/rust_walker.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// Pretty simple mob which creates areas of rust and has a rust-creating projectile spell
/mob/living/basic/heretic_summon/rust_walker
name = "Rust Walker"
name = "\improper Rust Walker"
real_name = "Rusty"
desc = "A grinding, clanking construct which leaches life from its surroundings with every armoured step."
icon_state = "rust_walker_s"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/heretic/star_gazer.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/mob/living/basic/heretic_summon/star_gazer
name = "Star Gazer"
name = "\improper Star Gazer"
desc = "A creature that has been tasked to watch over the stars."
icon = 'icons/mob/nonhuman-player/96x96eldritch_mobs.dmi'
icon_state = "star_gazer"
Expand Down