cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add cargo

Browse Source
This commit is contained in:
Razgriz
2022-04-10 14:18:16 -07:00
committed by GitHub
parent c6e3c93939
commit b59c1086cb
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/event_dynamic.dm
+12 -17
View File
@@ -186,13 +186,10 @@ var/list/event_last_fired = list()
active_with_role["AI"] = 0
active_with_role["Cyborg"] = 0
active_with_role["Janitor"] = 0
<<<<<<< HEAD
active_with_role["Gardener"] = 0
active_with_role["HOS"] = 0
active_with_role["Warden"] = 0
=======
active_with_role["Botanist"] = 0
>>>>>>> 298774524c4... Merge pull request #12368 from Heroman3003/event-min-jobs
active_with_role["HOS"] = 0 //CHOMP Add
active_with_role["Warden"] = 0 //CHOMP Add
active_with_role["Cargo"] = 0 //CHOMP Add
for(var/mob/M in player_list)
if(!M.mind || !M.client || M.client.is_afk(10 MINUTES)) // longer than 10 minutes AFK counts them as inactive
@@ -233,18 +230,16 @@ var/list/event_last_fired = list()
if(M.mind.assigned_role == "Janitor")
active_with_role["Janitor"]++
<<<<<<< HEAD
if(M.mind.assigned_role == "Gardener")
active_with_role["Gardener"]++
if(M.mind.assigned_role == "Head of Security")
active_with_role["Head of Security"]++
if(M.mind.assigned_role == "Warden")
active_with_role["Warden"]++
=======
if(M.mind.assigned_role == "Botanist")
active_with_role["Botanist"]++
>>>>>>> 298774524c4... Merge pull request #12368 from Heroman3003/event-min-jobs
if(M.mind.assigned_role == "Head of Security") //CHOMP Add
active_with_role["Head of Security"]++ //CHOMP Add
if(M.mind.assigned_role == "Warden") //CHOMP Add
active_with_role["Warden"]++ //CHOMP Add
if(M.mind.assigned_role == "Cargo") //CHOMP Add
active_with_role["Cargo"]++ //CHOMP Add
return active_with_role