diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 23f06e89..50a3a38b 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -24,6 +24,8 @@ var/list/gamemode_blacklist = list() // Event won't happen in these gamemodes var/list/gamemode_whitelist = list() // Event will happen ONLY in these gamemodes if not empty + var/list/map_blacklist = list() //Event won't run if this contains the current station map. Must be contain something like "BoxStation.dmm". Capitalization matters. + var/list/map_whitelist = list() //Same as above, except only for these maps var/triggering //admin cancellation @@ -50,6 +52,10 @@ return FALSE if(gamemode_whitelist.len && !(gamemode in gamemode_whitelist)) return FALSE + if(map_blacklist.len && (SSmapping.config.map_file in map_blacklist)) //HYPER EDIT: certain maps will get special events + return FALSE + if(map_whitelist.len && !(SSmapping.config.map_file in map_whitelist)) + return FALSE if(holidayID && (!SSevents.holidays || !SSevents.holidays[holidayID])) return FALSE return TRUE