mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-21 12:05:28 +01:00
Intercoms now work in the darkness
Adds job selection randomization by Randomone git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3484 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -188,6 +188,12 @@
|
||||
if(C.occupant.client)
|
||||
hear += C.occupant
|
||||
|
||||
for(var/obj/item/device/radio/theradio in V)
|
||||
if(isInSight(source,theradio))
|
||||
hear += theradio
|
||||
|
||||
|
||||
|
||||
return hear
|
||||
|
||||
#define SIGN(X) ((X<0)?-1:1)
|
||||
|
||||
@@ -27,6 +27,8 @@ var/global/datum/controller/occupations/job_master
|
||||
if(!job) continue
|
||||
if(job.faction != faction) continue
|
||||
occupations += job
|
||||
|
||||
occupations = shuffle(occupations) //Shuffles job-list at setup.
|
||||
return 1
|
||||
|
||||
|
||||
@@ -149,7 +151,6 @@ var/global/datum/controller/occupations/job_master
|
||||
if(unassigned.len == 0) return 0
|
||||
//Shuffle players and jobs
|
||||
unassigned = shuffle(unassigned)
|
||||
// occupations = shuffle(occupations) check and see if we can do this one
|
||||
|
||||
HandleFeedbackGathering()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user