cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-11 07:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1136 from DragonTrance/various-misc

Browse Source 
Fixes events (times 3)
This commit is contained in:
Dahlular
2021-05-07 19:22:58 -06:00
committed by GitHub
parent c818afbd3a 0c9557c2d2
commit cc590b11eb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/dynamic/dynamic_rulesets_events.dm
+7 -4
View File
@@ -16,13 +16,16 @@
var/list/map_blacklist = list() //Determines if a map, "BoxStation.dmm" for example, will spawn. Has to be case-sensitive
var/list/map_whitelist = list() //Blacklist/Whitelist does not check round event controllers, they are separate vars
/datum/dynamic_ruleset/event/acceptable(population=0, threat_level=0)
if (map_blacklist.len && (map_blacklist.Find(SSmapping.config.map_file)))
return FALSE
if (map_whitelist.len && !(map_whitelist.Find(SSmapping.config.map_file)))
return FALSE
return ..()
/datum/dynamic_ruleset/event/ready(forced = 0)
if (!forced)
var/job_check = 0
if (map_blacklist.len && (SSmapping.config.map_file in map_blacklist))
return FALSE
if (map_whitelist.len && !(SSmapping.config.map_file in map_whitelist))
return FALSE
if (enemy_roles.len > 0)
for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
if (M.stat == DEAD)
code/modules/events/_event.dm
+2 -2
View File
@@ -48,9 +48,9 @@
return FALSE
if(players_amt < min_players)
return FALSE
if(gamemode_blacklist.len && (gamemode in gamemode_blacklist))
if(gamemode_blacklist.len && (gamemode_blacklist.Find(gamemode)))
return FALSE
if(gamemode_whitelist.len && !(gamemode in gamemode_whitelist))
if(gamemode_whitelist.len && !(gamemode_whitelist.Find(gamemode)))
return FALSE
if(map_blacklist.len && (SSmapping.config.map_file in map_blacklist)) //HYPER EDIT: certain maps will get special events
return FALSE