WIP

2020-03-30 05:29:39 +02:00
parent 4eb2fb531a
commit c3faf94d8f
97 changed files with 580 additions and 1060 deletions
@@ -24,15 +24,16 @@
 	hitsound = "swing_hit"
 	armour_penetration = 50
 	var/active = 0
+	var/saber_color

 /obj/item/holo/esword/green/Initialize()
 	. = ..()
-	item_color = "green"
+	saber_color = "green"


 /obj/item/holo/esword/red/Initialize()
 	. = ..()
-	item_color = "red"
+	saber_color = "red"

 /obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(active)
@@ -44,13 +45,13 @@

 /obj/item/holo/esword/Initialize()
 	. = ..()
-	item_color = pick("red","blue","green","purple")
+	saber_color = pick("red","blue","green","purple")

 /obj/item/holo/esword/attack_self(mob/living/user as mob)
 	active = !active
 	if (active)
 		force = 30
-		icon_state = "sword[item_color]"
+		icon_state = "sword[saber_color]"
 		w_class = WEIGHT_CLASS_BULKY
 		hitsound = 'sound/weapons/blade1.ogg'
 		playsound(user, 'sound/weapons/saberon.ogg', 20, 1)