diff --git a/code/datums/helper_datums/tension.dm b/code/datums/helper_datums/tension.dm index 8c887e5924a..a63bae74603 100644 --- a/code/datums/helper_datums/tension.dm +++ b/code/datums/helper_datums/tension.dm @@ -20,8 +20,16 @@ var/global/datum/tension/tension_master var/deaths var/human_deaths var/explosions + var/adminhelps + var/air_alarms - + New() + score = 0 + deaths=0 + human_deaths=0 + explosions=0 + adminhelps=0 + air_alarms=0 proc/process() score += get_num_players()*PLAYER_WEIGHT @@ -50,8 +58,8 @@ var/global/datum/tension/tension_master score += EXPLO_SCORE explosions++ - New() - score = 0 - deaths=0 - human_deaths=0 - explosions=0 \ No newline at end of file + proc/new_adminhelp() + adminhelps++ + + proc/new_air_alarm() + air_alarms++ \ No newline at end of file diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 1401289d0a3..bb4aa02bae7 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -690,6 +690,7 @@ table tr:first-child th:first-child { border: none;} if(alert_level==2) alert_signal.data["alert"] = "severe" + tension_master.new_air_alarm() //log this for stats purposes else if (alert_level==1) alert_signal.data["alert"] = "minor" else if (alert_level==0) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 7131b2cbd90..43e4d1ca094 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -21,3 +21,4 @@ usr << "Your message has been broadcast to administrators." log_admin("HELP: [key_name(src)]: [msg]") + tension_master.new_adminhelp() diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 3b936f2b194..108092a47a8 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -212,11 +212,15 @@ Deaths: [tension_master.deaths]
---- Humans: [tension_master.human_deaths]
Explosions: [tension_master.explosions]
+Air alarms: [tension_master.air_alarms]
+Adminhelps: [tension_master.adminhelps]

Current Status
Tension: [tension_master.score]
Tension per player: [tension_master.score/tension_master.get_num_players()]
Recommendations: not yet implemented
+
+ "} usr << browse(output,"window=tensionreport") \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 68de9a6416c..6974c0e9885 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -5,6 +5,8 @@ src.stat = 2 src.canmove = 0 + tension_master.death(src) + src.camera.status = 0.0 if(src.in_contents_of(/obj/machinery/recharge_station))//exit the recharge station