Miscellaneous fixes

- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds

Fixes #6265
This commit is contained in:
Unknown
2019-12-06 17:10:13 -05:00
parent 26b0f83192
commit 5499e3272f
4 changed files with 73 additions and 22 deletions
+3 -1
View File
@@ -271,10 +271,12 @@
if (src.active)
user << "<span class='notice'>You extend the plastic blade with a quick flick of your wrist.</span>"
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
src.item_state = "[icon_state]_blade"
src.w_class = ITEMSIZE_LARGE
else
user << "<span class='notice'>You push the plastic blade back down into the handle.</span>"
playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
playsound(user, 'sound/weapons/saberoff.ogg', 50, 1
src.item_state = "[icon_state]"
src.w_class = ITEMSIZE_SMALL
update_icon()
src.add_fingerprint(user)
@@ -7,4 +7,19 @@
/obj/item/weapon/melee/energy/sword/imperial/activate(mob/living/user)
..()
icon_state = "sword1"
icon_state = "sword1"
/obj/item/weapon/melee/energy/sword/green/New()
lcolor = "#008000"
/obj/item/weapon/melee/energy/sword/red/New()
lcolor = "#FF0000"
/obj/item/weapon/melee/energy/sword/blue/New()
lcolor = "#0000FF"
/obj/item/weapon/melee/energy/sword/purple/New()
lcolor = "#800080"
/obj/item/weapon/melee/energy/sword/white/New()
lcolor = "#FFFFFF"