cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves #2435

Browse Source
This commit is contained in:
Yoshax
2016-10-07 03:40:05 +01:00
parent 7e79d9b5f8
commit 19e0342145
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -7,6 +7,9 @@
edge = 0 edge = 0
armor_penetration = 50 armor_penetration = 50
flags = NOBLOODY flags = NOBLOODY
var/lrange = 2
var/lpower = 2
var/lcolor = "#0099FF"
/obj/item/weapon/melee/energy/proc/activate(mob/living/user) /obj/item/weapon/melee/energy/proc/activate(mob/living/user)
anchored = 1 anchored = 1
@@ -19,6 +22,7 @@
edge = 1 edge = 1
w_class = active_w_class w_class = active_w_class
playsound(user, 'sound/weapons/saberon.ogg', 50, 1) playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
set_light(lrange, lpower, lcolor)
/obj/item/weapon/melee/energy/proc/deactivate(mob/living/user) /obj/item/weapon/melee/energy/proc/deactivate(mob/living/user)
anchored = 0 anchored = 0
@@ -31,6 +35,7 @@
sharp = initial(sharp) sharp = initial(sharp)
edge = initial(edge) edge = initial(edge)
w_class = initial(w_class) w_class = initial(w_class)
set_light(0,0)
/obj/item/weapon/melee/energy/attack_self(mob/living/user as mob) /obj/item/weapon/melee/energy/attack_self(mob/living/user as mob)
if (active) if (active)
@@ -124,26 +129,33 @@
/obj/item/weapon/melee/energy/sword/New() /obj/item/weapon/melee/energy/sword/New()
blade_color = pick("red","blue","green","purple") blade_color = pick("red","blue","green","purple")
lcolor = blade_color
/obj/item/weapon/melee/energy/sword/green/New() /obj/item/weapon/melee/energy/sword/green/New()
blade_color = "green" blade_color = "green"
lcolor = "#008000"
/obj/item/weapon/melee/energy/sword/red/New() /obj/item/weapon/melee/energy/sword/red/New()
blade_color = "red" blade_color = "red"
lcolor = "#FF0000"
/obj/item/weapon/melee/energy/sword/blue/New() /obj/item/weapon/melee/energy/sword/blue/New()
blade_color = "blue" blade_color = "blue"
lcolor = "#0000FF"
/obj/item/weapon/melee/energy/sword/purple/New() /obj/item/weapon/melee/energy/sword/purple/New()
blade_color = "purple" blade_color = "purple"
lcolor = "#800080"
/obj/item/weapon/melee/energy/sword/activate(mob/living/user) /obj/item/weapon/melee/energy/sword/activate(mob/living/user)
if(!active) if(!active)
user << "<span class='notice'>\The [src] is now energised.</span>" user << "<span class='notice'>\The [src] is now energised.</span>"
..() ..()
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
icon_state = "sword[blade_color]" icon_state = "sword[blade_color]"
/obj/item/weapon/melee/energy/sword/deactivate(mob/living/user) /obj/item/weapon/melee/energy/sword/deactivate(mob/living/user)
if(active) if(active)
user << "<span class='notice'>\The [src] deactivates!</span>" user << "<span class='notice'>\The [src] deactivates!</span>"
@@ -193,6 +205,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
var/mob/living/creator var/mob/living/creator
var/datum/effect/effect/system/spark_spread/spark_system var/datum/effect/effect/system/spark_spread/spark_system
lcolor = "#00FF00"
/obj/item/weapon/melee/energy/blade/New() /obj/item/weapon/melee/energy/blade/New()
@@ -201,6 +214,7 @@
spark_system.attach(src) spark_system.attach(src)
processing_objects |= src processing_objects |= src
set_light(lrange, lpower, lcolor)
/obj/item/weapon/melee/energy/blade/Destroy() /obj/item/weapon/melee/energy/blade/Destroy()
processing_objects -= src processing_objects -= src