Merge branch 'master' of ctpug:tabakrolletjie

diff --cc tabakrolletjie/lights.py
index 723da6a9f427ee0304130269bc6f76716dfd8f19,bae4df333482aac86024710984bda873fcbc5231..8ef12655ed5da1958a6187a474c8e9c69ea77cf7
--- 1/tabakrolletjie/lights.py
--- 2/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@@ -237,8 -245,11 +245,11 @@@ class BaseLight(object)
          return 5 * area * self.intensity / 6400  # 80x80 unit area
  
      def base_damage(self):
 -        return 5 * self.intensity
 +        return 10 * self.intensity
  
+     def off(self):
+         self.on = False
+ 
      def toggle(self):
          self.colour_pos += 1
          if self.colour_pos >= len(self.colour_cycle):