Merge branch 'master' into dev

Conflicts:
	code/setup.dm
This commit is contained in:
Chinsky
2013-10-08 15:16:57 +04:00
11 changed files with 150 additions and 188 deletions

View File

@@ -886,7 +886,7 @@
user.SetLuminosity(round(user.luminosity + (potency/10),1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
user.SetLuminosity(round(user.luminosity + (potency/10),1))
user.SetLuminosity(round(user.luminosity - (potency/10),1))
SetLuminosity(round(potency/10,1))