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

Reduces spam from new event system. (#7355)

Browse Source
This commit is contained in:
Neerti
2020-07-22 06:03:27 -04:00
committed by VirgoBot
parent ebcfd0cc35
commit 2aaca96081
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/gamemaster/event2/events/everyone/electrical_fault.dm
View File

@@ -77,7 +77,7 @@
// This will actually protect it from further damage. // This will actually protect it from further damage.
if(prob(25)) if(prob(25))
A.energy_fail(rand(60, 120)) A.energy_fail(rand(60, 120))
log_debug("ELECTRICAL EVENT: Disabled \the [A]'s power for a temporary amount of time.") // log_debug("ELECTRICAL EVENT: Disabled \the [A]'s power for a temporary amount of time.")
playsound(A, 'sound/machines/defib_success.ogg', 50, 1) playsound(A, 'sound/machines/defib_success.ogg', 50, 1)
apcs_disabled++ apcs_disabled++
return return
@@ -85,7 +85,7 @@
// Decent chance to overload lighting circuit. // Decent chance to overload lighting circuit.
if(prob(30)) if(prob(30))
A.overload_lighting() A.overload_lighting()
log_debug("ELECTRICAL EVENT: Overloaded \the [A]'s lighting.") // log_debug("ELECTRICAL EVENT: Overloaded \the [A]'s lighting.")
playsound(A, 'sound/effects/lightningshock.ogg', 50, 1) playsound(A, 'sound/effects/lightningshock.ogg', 50, 1)
apcs_overloaded++ apcs_overloaded++
@@ -93,7 +93,7 @@
if(prob(5)) if(prob(5))
A.emagged = TRUE A.emagged = TRUE
A.update_icon() A.update_icon()
log_debug("ELECTRICAL EVENT: Emagged \the [A].") // log_debug("ELECTRICAL EVENT: Emagged \the [A].")
playsound(A, 'sound/machines/chime.ogg', 50, 1) playsound(A, 'sound/machines/chime.ogg', 50, 1)
apcs_emagged++ apcs_emagged++

6
code/modules/metric/activity.dm
View File

@@ -40,13 +40,13 @@
var/list/activity = list() var/list/activity = list()
for(var/department in departments) for(var/department in departments)
activity[department] = assess_department(department) activity[department] = assess_department(department)
log_debug("Assessing department [department]. They have activity of [activity[department]].") // log_debug("Assessing department [department]. They have activity of [activity[department]].")
var/list/most_active_departments = list() // List of winners. var/list/most_active_departments = list() // List of winners.
var/highest_activity = null // Department who is leading in activity, if one exists. var/highest_activity = null // Department who is leading in activity, if one exists.
var/highest_number = 0 // Activity score needed to beat to be the most active department. var/highest_number = 0 // Activity score needed to beat to be the most active department.
for(var/i = 1, i <= cutoff_number, i++) for(var/i = 1, i <= cutoff_number, i++)
log_debug("Doing [i]\th round of counting.") // log_debug("Doing [i]\th round of counting.")
for(var/department in activity) for(var/department in activity)
if(department in department_blacklist) // Blacklisted? if(department in department_blacklist) // Blacklisted?
continue continue
@@ -57,7 +57,7 @@
if(highest_activity) // Someone's a winner. if(highest_activity) // Someone's a winner.
most_active_departments.Add(highest_activity) // Add to the list of most active. most_active_departments.Add(highest_activity) // Add to the list of most active.
activity.Remove(highest_activity) // Remove them from the other list so they don't win more than once. activity.Remove(highest_activity) // Remove them from the other list so they don't win more than once.
log_debug("[highest_activity] has won the [i]\th round of activity counting.") // log_debug("[highest_activity] has won the [i]\th round of activity counting.")
highest_activity = null // Now reset for the next round. highest_activity = null // Now reset for the next round.
highest_number = 0 highest_number = 0
//todo: finish //todo: finish