Standardize LASER, NOCLONE, and HUSK

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
This commit is contained in:
Rob Nelson
2014-01-21 22:59:53 -05:00
committed by ZomgPonies
parent f44ff1d7aa
commit 7892eeb7cc
23 changed files with 214 additions and 34 deletions
+1 -1
View File
@@ -45,7 +45,7 @@
range = -1
include_user = 1
mutations = list(LASER, M_HULK)
mutations = list(M_LASER, M_HULK)
duration = 300
cooldown_min = 300 //25 deciseconds reduction per rank