From eb19ebab4f19e07bea09be4e2f3594475d92fbea Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Wed, 24 Jan 2018 13:43:31 -0600 Subject: [PATCH] Refactor to use light_power --- code/game/objects/items/weapons/melee/energy.dm | 5 +++-- code/game/objects/items/weapons/twohanded.dm | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 9d3b4e86017..16b8d302c7f 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -9,6 +9,7 @@ hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave usesound = 'sound/weapons/blade1.ogg' toolspeed = 1 + light_power = 2 var/brightness_on = 2 var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE) @@ -31,10 +32,10 @@ attack_verb = attack_verb_on if(!item_color) icon_state = icon_state_on - set_light(brightness_on, 2) + set_light(brightness_on) else icon_state = "sword[item_color]" - set_light(brightness_on, 2, colormap[item_color]) + set_light(brightness_on, l_color=colormap[item_color]) w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness to_chat(user, "[src] is now active.") diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index eaff761725b..96628da9a26 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -208,6 +208,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 75 sharp = 1 + light_power = 2 var/brightness_on = 2 var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE) @@ -218,7 +219,7 @@ /obj/item/weapon/twohanded/dualsaber/update_icon() if(wielded) icon_state = "dualsaber[blade_color][wielded]" - set_light(brightness_on, 2, colormap[blade_color]) + set_light(brightness_on, l_color=colormap[blade_color]) else icon_state = "dualsaber0" set_light(0)