cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] events now have to check parent to see if they can run [MDB IGNORE] (#16506)

Browse Source 
* events now have to check parent to see if they can run (#70128)

* events now have to check parent to see if they can run

* update supermatter_surge

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-09-28 23:20:10 +02:00
committed by GitHub
parent 3802dbb3ec
commit 63f635d57a
15 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystem/events.dm
View File

@@ -91,7 +91,7 @@ SUBSYSTEM_DEF(events)
// Only alive, non-AFK human players count towards this.
var/sum_of_weights = 0
for(var/datum/round_event_control/E in control)
if(!E.canSpawnEvent(players_amt))
if(!E.can_spawn_event(players_amt))
continue
//SKYRAT EDIT ADDITION
if(threat_override && !E.alert_observers)
@@ -108,7 +108,7 @@ SUBSYSTEM_DEF(events)
sum_of_weights = rand(0,sum_of_weights) //reusing this variable. It now represents the 'weight' we want to select
for(var/datum/round_event_control/E in control)
if(!E.canSpawnEvent(players_amt))
if(!E.can_spawn_event(players_amt))
continue
sum_of_weights -= E.weight