shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #807 from Citadel-Station-13/upstream-merge-26631

Browse Source 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
This commit is contained in:
LetterJay
2017-05-16 17:13:30 -04:00
committed by GitHub
parent ddee13467a eac970c1f1
commit 4710beca0e
28 changed files with 834 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/game.dm
+64 -3
View File
@@ -6,6 +6,7 @@
)
#define Z_TURFS(ZLEVEL) block(locate(1,1,ZLEVEL), locate(world.maxx, world.maxy, ZLEVEL))
#define CULT_POLL_WAIT 2400
/proc/get_area(atom/A)
if (!istype(A))
@@ -313,10 +314,10 @@
// Will return a list of active candidates. It increases the buffer 5 times until it finds a candidate which is active within the buffer.
/proc/get_candidates(be_special_type, afk_bracket = config.inactivity_period, jobbanType)
/proc/get_candidates(be_special_type, afk_bracket = config.inactivity_period, jobbanType)
var/list/candidates = list()
// Keep looping until we find a non-afk candidate within the time bracket (we limit the bracket to 10 minutes (6000))
while(!candidates.len && afk_bracket < config.afk_period)
while(!candidates.len && afk_bracket < config.afk_period)
for(var/mob/dead/observer/G in GLOB.player_list)
if(G.client != null)
if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
@@ -485,6 +486,66 @@
++i
return L
/proc/pollCultists(var/mob/living/Nominee) // Cult Master Poll
var/time_passed = world.time
var/list/yes_voters = new
var/list/cult_total = new
if(world.time < CULT_POLL_WAIT)
Nominee << "It would be premature to select a leader while everyone is still settling in, try again in [round((CULT_POLL_WAIT-world.time)/10)] seconds"
return
for(var/datum/mind/B in SSticker.mode.cult)
var/mob/living/M = B.current
if(!M.incapacitated())
M << 'sound/hallucinations/im_here1.ogg'
M.verbs -= /mob/living/proc/cult_master
to_chat(M, "<span class='cultlarge'>Acolyte [Nominee] has asserted that they are worthy of leading the cult. A vote will be called shortly.</span>")
sleep(250)
for(var/datum/mind/B in SSticker.mode.cult)
var/mob/living/M = B.current
if(!M.incapacitated())
M << 'sound/magic/exit_blood.ogg'
switch(askuser(M,"[Nominee] seeks to lead your cult, do you support them?","Please answer in 20 seconds!","Yes","No","Abstain", StealFocus=0, Timeout=200))
if(1)
if((world.time-time_passed)>500)
to_chat(M, "<span class='danger'>Sorry, your vote came too late!</span>")
M << 'sound/machines/buzz-sigh.ogg'
else
M << "<span class='notice'>Choice registered: Yes.</span>"
yes_voters += M
cult_total += M
if(2)
if((world.time-time_passed)>500)
to_chat(M, "<span class='danger'>Sorry, your vote came too late!</span>")
M << 'sound/machines/buzz-sigh.ogg'
else
to_chat(M, "<span class='danger'>Choice registered: No.</span>")
cult_total += M
if(3)
to_chat(M, "<span class='danger'>Choice registered: Abstain.</span>")
sleep(300)
if(yes_voters.len > (cult_total.len/2))
var/datum/action/innate/cultmast/finalreck/FinalReckoning = new()
var/datum/action/innate/cultmast/cultmark/Mark = new()
FinalReckoning.Grant(Nominee)
Mark.Grant(Nominee)
Nominee.mind.special_role = "Cult Master"
Nominee.update_action_buttons_icon()
Nominee.apply_status_effect(/datum/status_effect/cult_master)
SSticker.mode.set_antag_hud(Nominee,"cultmaster")
GLOB.cult_mastered = TRUE
for(var/datum/mind/B in SSticker.mode.cult)
if(!B.current.incapacitated())
to_chat(B.current,"<span class='cultlarge'>[Nominee] has the cult's support and is now their master. Follow their orders to the best of your ability!")
return TRUE
else
for(var/datum/mind/B in SSticker.mode.cult)
if(!B.current.incapacitated())
to_chat(B.current, "<span class='cultlarge'>[Nominee] could not win the cult's support and shall continue to serve as an acolyte.")
B.current.verbs += /mob/living/proc/cult_master
return FALSE
/proc/poll_helper(var/mob/living/M)
/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
if(!G_found || !G_found.key)
return
@@ -513,7 +574,7 @@
winset(C, "mainwindow", "flash=5")
/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
if(!SSticker.IsRoundInProgress() || !character)
if(!SSticker.IsRoundInProgress() || !character)
return
var/area/A = get_area(character)
var/message = "<span class='game deadsay'><span class='name'>\
code/__HELPERS/game.dm.rej
+66
View File
@@ -0,0 +1,66 @@
diff a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm (rejected hunks)
@@ -489,41 +490,38 @@
var/time_passed = world.time
var/list/yes_voters = new
var/list/cult_total = new
- if(world.time<1800)
- Nominee << "It would be premature to select a leader while everyone is still settling in, try again in [round((1800-world.time)/10)] seconds"
+ if(world.time < CULT_POLL_WAIT)
+ Nominee << "It would be premature to select a leader while everyone is still settling in, try again in [round((CULT_POLL_WAIT-world.time)/10)] seconds"
return
for(var/datum/mind/B in SSticker.mode.cult)
- if(!isliving(B.current))
- continue
var/mob/living/M = B.current
- if(isliving(M))
+ if(!M.incapacitated())
M << 'sound/hallucinations/im_here1.ogg'
M.verbs -= /mob/living/proc/cult_master
to_chat(M, "<span class='cultlarge'>Acolyte [Nominee] has asserted that they are worthy of leading the cult. A vote will be called shortly.</span>")
sleep(250)
for(var/datum/mind/B in SSticker.mode.cult)
- if(!isliving(B.current))
- continue
var/mob/living/M = B.current
- M << 'sound/magic/exit_blood.ogg'
- switch(askuser(M,"[Nominee] seeks to lead your cult, do you support them?","Please answer in 20 seconds!","Yes","No","Abstain", StealFocus=0, Timeout=200))
- if(1)
- if((world.time-time_passed)>500)
- M << "<span class='danger'>Sorry, your vote came too late!</span>"
- M << 'sound/machines/buzz-sigh.ogg'
- else
- M << "<span class='notice'>Choice registered: Yes.</span>"
- yes_voters += M
- cult_total += M
- if(2)
- if((world.time-time_passed)>500)
- M << "<span class='danger'>Sorry, your vote came too late!</span>"
- M << 'sound/machines/buzz-sigh.ogg'
- else
- M << "<span class='danger'>Choice registered: No.</span>"
- cult_total += M
- if(3)
- M << "<span class='danger'>Choice registered: Abstain.</span>"
+ if(!M.incapacitated())
+ M << 'sound/magic/exit_blood.ogg'
+ switch(askuser(M,"[Nominee] seeks to lead your cult, do you support them?","Please answer in 20 seconds!","Yes","No","Abstain", StealFocus=0, Timeout=200))
+ if(1)
+ if((world.time-time_passed)>500)
+ to_chat(M, "<span class='danger'>Sorry, your vote came too late!</span>")
+ M << 'sound/machines/buzz-sigh.ogg'
+ else
+ M << "<span class='notice'>Choice registered: Yes.</span>"
+ yes_voters += M
+ cult_total += M
+ if(2)
+ if((world.time-time_passed)>500)
+ to_chat(M, "<span class='danger'>Sorry, your vote came too late!</span>")
+ M << 'sound/machines/buzz-sigh.ogg'
+ else
+ to_chat(M, "<span class='danger'>Choice registered: No.</span>")
+ cult_total += M
+ if(3)
+ to_chat(M, "<span class='danger'>Choice registered: Abstain.</span>")
sleep(300)
if(yes_voters.len > (cult_total.len/2))
var/datum/action/innate/cultmast/finalreck/FinalReckoning = new()
code/__HELPERS/matrices.dm
-1
View File
@@ -24,7 +24,6 @@
//doesn't have an object argument because this is "Stacking" with the animate call above
//3 billion% intentional
//Dumps the matrix data in format a-f
/matrix/proc/tolist()
. = list()