Corrects incorrect shuffles

This commit is contained in:
Cyberboss
2017-04-11 09:32:13 -04:00
parent fcfcdf1af1
commit fa39d8bfe1
9 changed files with 13 additions and 13 deletions
+1 -1
View File
@@ -99,7 +99,7 @@
var/list/blobs_to_affect = list()
for(var/obj/structure/blob/B in urange(claim_range, src, 1))
blobs_to_affect += B
shuffle(blobs_to_affect)
shuffle_inplace(blobs_to_affect)
for(var/L in blobs_to_affect)
var/obj/structure/blob/B = L
if(!B.overmind && !istype(B, /obj/structure/blob/core) && prob(30))
+1 -1
View File
@@ -124,7 +124,7 @@ structure_check() searches for nearby cultist structures required for the invoca
if(allow_excess_invokers)
chanters += invokers
else
shuffle(invokers)
shuffle_inplace(invokers)
for(var/i in 1 to req_cultists)
var/L = pick_n_take(invokers)
if(L)
+1 -1
View File
@@ -65,7 +65,7 @@
// As soon as we get 3 or 4 extra latejoin traitors, make them traitors and kill each other.
if(late_joining_list.len >= rand(3, 4))
// True randomness
shuffle(late_joining_list)
shuffle_inplace(late_joining_list)
// Reset the target_list, it'll be used again in force_traitor_objectives
target_list = list()
+1 -1
View File
@@ -117,7 +117,7 @@
mages_made--
return
else
shuffle(candidates)
shuffle_inplace(candidates)
for(var/mob/i in candidates)
if(!i || !i.client) continue //Dont bother removing them from the list since we only grab one wizard
+1 -1
View File
@@ -224,7 +224,7 @@
var/agentcount = 0
for(var/i = 0, i<numagents,i++)
shuffle(candidates) //More shuffles means more randoms
shuffle_inplace(candidates) //More shuffles means more randoms
for(var/mob/j in candidates)
if(!j || !j.client)
candidates.Remove(j)
+1 -1
View File
@@ -63,7 +63,7 @@
else
regular_candidates = list()
shuffle(regular_candidates)
shuffle_inplace(regular_candidates)
var/list/candidates = priority_candidates + regular_candidates
+5 -5
View File
@@ -21,8 +21,8 @@
if(!mobs)
return
shuffle(moblocs)
shuffle(mobs)
shuffle_inplace(moblocs)
shuffle_inplace(mobs)
for(var/mob/living/carbon/human/H in mobs)
if(!moblocs)
@@ -55,8 +55,8 @@
if(!mobs)
return
shuffle(mobnames)
shuffle(mobs)
shuffle_inplace(mobnames)
shuffle_inplace(mobs)
for(var/mob/living/carbon/human/H in mobs)
if(!mobnames)
@@ -89,7 +89,7 @@
if(!mobs)
return
shuffle(mobs)
shuffle_inplace(mobs)
var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new /obj/effect/proc_holder/spell/targeted/mind_transfer
while(mobs.len > 1)
+1 -1
View File
@@ -51,7 +51,7 @@
P.name = "Blank Card"
P.card_icon = "cas_white"
cards += P
shuffle(cards) // distribute blank cards throughout deck
shuffle_inplace(cards) // distribute blank cards throughout deck
..()
/obj/item/toy/cards/deck/cas/attack_hand(mob/user)
@@ -326,7 +326,7 @@ Difficulty: Hard
pools_to_remove = get_pools(get_turf(target), 1)
pools -= pools_to_remove
if(pools.len)
shuffle(pools)
shuffle_inplace(pools)
found_bloodpool = pick(pools)
if(found_bloodpool)
visible_message("<span class='danger'>[src] sinks into the blood...</span>")