cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allows ghosts signed up for ghost roles to leave the pool (#17488)

Browse Source 
* Add new mechanism for rejecting a signup

* remove_mob -> remove_candidate

* Update code/controllers/subsystem/ghost_spawns.dm

Sssssssso TRUE

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Cancel notif is now bold red

* Update code/controllers/subsystem/ghost_spawns.dm

Make messages use consistent styling

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
Luc
2022-03-21 22:32:49 +00:00
committed by GitHub
co-authored by AffectedArc07
parent 7f9cd8541b
commit 60a514dcb3
2 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/alert.dm
+30 -9
View File
@@ -522,6 +522,7 @@ so as to remain in compliance with the most up-to-date laws."
var/action = NOTIFY_JUMP
var/show_time_left = FALSE // If true you need to call START_PROCESSING manually
var/image/time_left_overlay // The last image showing the time left
var/image/signed_up_overlay // image showing that you're signed up
var/datum/candidate_poll/poll // If set, on Click() it'll register the player as a candidate
/obj/screen/alert/notify_action/process()
@@ -551,6 +552,9 @@ so as to remain in compliance with the most up-to-date laws."
/obj/screen/alert/notify_action/Destroy()
target = null
if(signed_up_overlay)
overlays -= signed_up_overlay
qdel(signed_up_overlay)
return ..()
/obj/screen/alert/notify_action/Click()
@@ -561,9 +565,14 @@ so as to remain in compliance with the most up-to-date laws."
return
if(poll)
if(poll.sign_up(G))
var/success
if(G in poll.signed_up)
success = poll.remove_candidate(G)
else
success = poll.sign_up(G)
if(success)
// Add a small overlay to indicate we've signed up
display_signed_up()
update_signed_up_alert()
else if(target)
switch(action)
if(NOTIFY_ATTACK)
@@ -576,14 +585,26 @@ so as to remain in compliance with the most up-to-date laws."
G.ManualFollow(target)
/obj/screen/alert/notify_action/Topic(href, href_list)
if(href_list["signup"] && poll?.sign_up(usr))
display_signed_up()
if(!href_list["signup"])
return
if(!poll)
return
var/mob/dead/observer/G = usr
if(G in poll.signed_up)
poll.remove_candidate(G)
else
poll.sign_up(G)
update_signed_up_alert()
/obj/screen/alert/notify_action/proc/display_signed_up()
var/image/I = image('icons/mob/screen_gen.dmi', icon_state = "selector")
I.layer = FLOAT_LAYER
I.plane = FLOAT_PLANE + 2
overlays += I
/obj/screen/alert/notify_action/proc/update_signed_up_alert()
if(!signed_up_overlay)
signed_up_overlay = image('icons/mob/screen_gen.dmi', icon_state = "selector")
signed_up_overlay.layer = FLOAT_LAYER
signed_up_overlay.plane = FLOAT_PLANE + 2
if(usr in poll.signed_up)
overlays += signed_up_overlay
else
overlays -= signed_up_overlay
/obj/screen/alert/notify_action/proc/display_stacks(stacks = 1)
if(stacks <= 1)
code/controllers/subsystem/ghost_spawns.dm
+37 -2
View File
@@ -96,7 +96,7 @@ SUBSYSTEM_DEF(ghost_spawns)
if(P != P2 && P.hash == P2.hash)
// If there's already a poll for an identical mob type ongoing and the client is signed up for it, sign them up for this one
if(!inherited_sign_up && (M in P2.signed_up) && P.sign_up(M, TRUE))
A.display_signed_up()
A.update_signed_up_alert()
inherited_sign_up = TRUE
// This number is used to display the number of polls the alert regroups
num_stack++
@@ -243,6 +243,7 @@ SUBSYSTEM_DEF(ghost_spawns)
if(!silent)
to_chat(M, "<span class='warning'>You have already signed up for this!</span>")
return
if(time_left() <= 0)
if(!silent)
to_chat(M, "<span class='danger'>Sorry, you were too late for the consideration!</span>")
@@ -251,7 +252,7 @@ SUBSYSTEM_DEF(ghost_spawns)
signed_up += M
if(!silent)
to_chat(M, "<span class='notice'>You have signed up for this role! A candidate will be picked randomly soon..</span>")
to_chat(M, "<span class='notice'>You have signed up for this role! A candidate will be picked randomly soon.</span>")
// Sign them up for any other polls with the same mob type
for(var/existing_poll in SSghost_spawns.currently_polling)
var/datum/candidate_poll/P = existing_poll
@@ -260,6 +261,40 @@ SUBSYSTEM_DEF(ghost_spawns)
return TRUE
/**
* Attempts to remove a signed-up mob from a poll.
*
* Arguments:
* * M - The mob to remove from the poll, if present.
* * silent - If TRUE, no messages will be sent to M about their removal.
*/
/datum/candidate_poll/proc/remove_candidate(mob/dead/observer/M, silent = FALSE)
. = FALSE
if(!istype(M) || !M.key || !M.client)
return
if(!(M in signed_up))
if(!silent)
to_chat(M, "<span class='warning'>You aren't signed up for this!</span>")
return
if(time_left() <= 0)
if(!silent)
to_chat(M, "<span class='danger'>It's too late to unregister yourself, selection has already begun!</span>")
return
signed_up -= M
if(!silent)
to_chat(M, "<span class='notice'>You have been unregistered as a candidate for this role. You can freely sign up again before the poll ends.</span>")
for(var/existing_poll in SSghost_spawns.currently_polling)
var/datum/candidate_poll/P = existing_poll
if(src != P && hash == P.hash && (M in P.signed_up))
P.remove_candidate(M, TRUE)
return TRUE
/**
* Deletes any candidates who may have disconnected from the list
*/