cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16680 from Core0verload/nomoremagic

Browse Source 
Wizard events will no longer fire unless actually summoned by a wizard
This commit is contained in:
AnturK
2016-04-09 15:57:30 +02:00
parent 9b52931403 c35fe4ea66
commit fee254926e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/events.dm
-6
View File
@@ -27,8 +27,6 @@ var/datum/subsystem/events/SSevent
var/datum/round_event_control/E = new type()
if(!E.typepath)
continue //don't want this one! leave it for the garbage collector
if(E.wizardevent && !wizardmode)
E.weight = 0
control += E //add it to the list of all events (controls)
reschedule()
getHoliday()
@@ -199,10 +197,6 @@ var/datum/subsystem/events/SSevent
/datum/subsystem/events/proc/toggleWizardmode()
wizardmode = !wizardmode
for(var/datum/round_event_control/E in SSevent.control)
E.weight = initial(E.weight)
if((E.wizardevent && !wizardmode) || (!E.wizardevent && wizardmode))
E.weight = 0
message_admins("Summon Events has been [wizardmode ? "enabled, events will occur every [SSevent.frequency_lower / 600] to [SSevent.frequency_upper / 600] minutes" : "disabled"]!")
log_game("Summon Events was [wizardmode ? "enabled" : "disabled"]!")