Skip to content

Commit

Permalink
Fixed some event things (#25403)
Browse files Browse the repository at this point in the history
  • Loading branch information
MengisLordis authored May 7, 2024
1 parent fa206c7 commit f27f8fa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/events/event_container.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ GLOBAL_LIST_EMPTY(event_last_fired)
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Mundane News", /datum/event/mundane_news, 300),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 100, list(ASSIGNMENT_JANITOR = 100)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Sentience", /datum/event/sentience, 50),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30, ASSIGNMENT_GARDENER = 50)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Fungal Growth", /datum/event/wallrot/fungus, 50, list(ASSIGNMENT_CHEMIST = 50)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Koi School", /datum/event/carp_migration/koi, 80),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Camera Failure", /datum/event/camera_failure, 100, list(ASSIGNMENT_ENGINEER = 10)),
Expand Down
4 changes: 4 additions & 0 deletions code/modules/events/event_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
active_with_role["Cyborg"] = 0
active_with_role["Janitor"] = 0
active_with_role["Botanist"] = 0
active_with_role["Chemist"] = 0
active_with_role["Any"] = length(GLOB.player_list)

for(var/mob/M in GLOB.player_list)
Expand Down Expand Up @@ -105,6 +106,9 @@
if(M.mind.assigned_role == "Botanist")
active_with_role["Botanist"]++

if(M.mind.assigned_role == "Chemist")
active_with_role["Chemist"]++

return active_with_role

/datum/event/proc/num_players()
Expand Down

0 comments on commit f27f8fa

Please sign in to comment.