[MIRROR] Fixed possessed blades being broken (#29067)

* Fixed possessed blades being broken (#85090)

## About The Pull Request

Fixed possessed blades being broken

If testing is enabled everyone is polled in ghost polls.

## Why It's Good For The Game

> Fixed possessed blades being broken

oopse

> If testing is enabled everyone is polled in ghost polls.

MUCH eaiser to test

## Changelog

🆑
fix: Fixed possessed blades being broken
code: If testing is enabled everyone is polled in ghost polls.
/🆑

---------

Co-authored-by: Time-Green <7501474+Time-Green@ users.noreply.github.com>

* Fixed possessed blades being broken

---------

Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-26 20:17:33 +05:30
committed by GitHub
co-authored by Time-Green carlarctg
parent 3a27cb9b6d
commit 4ad877a8dd
2 changed files with 14 additions and 6 deletions
+6
View File
@@ -206,6 +206,12 @@ SUBSYSTEM_DEF(polling)
return
for(var/mob/dead/observer/ghost_player in GLOB.player_list)
candidates += ghost_player
#ifdef TESTING
for(var/mob/dude in GLOB.player_list)
candidates |= dude
#endif
return poll_candidates(question, role, check_jobban, poll_time, ignore_category, flashwindow, candidates, alert_pic, jump_target, role_name_text, custom_response_messages, start_signed_up, amount_to_pick, chat_text_border_icon, announce_chosen)
/datum/controller/subsystem/polling/proc/poll_ghosts_for_target(
+8 -6
View File
@@ -7,9 +7,9 @@
///bool on if this component is currently polling for observers to inhabit the item
var/attempting_awakening = FALSE
/// Allows renaming the bound item
var/allow_renaming
var/allow_renaming = TRUE
/// Allows channeling
var/allow_channeling
var/allow_channeling = TRUE
/// Allows exorcism
var/allow_exorcism
///mob contained in the item.
@@ -92,7 +92,7 @@
to_chat(ghost, span_userdanger("The new vessel for your spirit has been destroyed! You remain an unbound ghost."))
return
bind_the_soule(ghost, awakener)
bind_the_soule(ghost.mind, awakener)
attempting_awakening = FALSE
@@ -119,11 +119,13 @@
* Arguments:
* * awakener: user who interacted with the blade
*/
/datum/component/spirit_holding/proc/custom_name(mob/awakener)
/datum/component/spirit_holding/proc/custom_name(mob/awakener, iteration = 1)
if(iteration > 5)
return "indecision" // The spirit of indecision
var/chosen_name = sanitize_name(tgui_input_text(bound_spirit, "What are you named?", "Spectral Nomenclature", max_length = MAX_NAME_LEN))
if(!chosen_name) // with the way that sanitize_name works, it'll actually send the error message to the awakener as well.
to_chat(awakener, span_warning("Your blade did not select a valid name! Please wait as they try again.")) // more verbose than what sanitize_name might pass in its error message
return custom_name(awakener)
to_chat(awakener, span_warning("Your blade did not select a valid name! Please wait as they try again.")) // more verbose than what sanitize_name might pass in it's error message
return custom_name(awakener, iteration++)
return chosen_name
///signal fired from a mob moving inside the parent