From da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9 Mon Sep 17 00:00:00 2001 From: Nalarac Date: Wed, 24 Jul 2019 15:38:18 -0500 Subject: [PATCH] Change laser.dm to master? --- code/modules/projectiles/guns/energy/laser.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index eeb8d779d2..1dee0845ce 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -90,6 +90,7 @@ catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_pistol) icon_state = "alienpistol" item_state = "alienpistol" + fire_sound = 'sound/weapons/eLuger.ogg' fire_delay = 10 // Handguns should be inferior to two-handed weapons. Even alien ones I suppose. charge_cost = 480 // Five shots. @@ -221,7 +222,7 @@ desc = "Standard issue weapon of the Imperial Guard" origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2) matter = list(DEFAULT_WALL_MATERIAL = 2000) - projectile_type = /obj/item/projectile/beam/lasertag/blue + projectile_type = /obj/item/projectile/beam/lastertag/blue cell_type = /obj/item/weapon/cell/device/weapon/recharge battery_lock = 1 var/required_vest @@ -236,19 +237,18 @@ /obj/item/weapon/gun/energy/lasertag/blue icon_state = "bluetag" item_state = "bluetag" - projectile_type = /obj/item/projectile/beam/lasertag/blue + projectile_type = /obj/item/projectile/beam/lastertag/blue required_vest = /obj/item/clothing/suit/bluetag /obj/item/weapon/gun/energy/lasertag/red icon_state = "redtag" item_state = "redtag" - projectile_type = /obj/item/projectile/beam/lasertag/red + projectile_type = /obj/item/projectile/beam/lastertag/red required_vest = /obj/item/clothing/suit/redtag -/obj/item/weapon/gun/energy/lasertag/omni - projectile_type = /obj/item/projectile/beam/lasertag/omni - -// Laser scattergun, proof of concept. +/* + * Laser scattergun, proof of concept. + */ /obj/item/weapon/gun/energy/lasershotgun name = "laser scattergun"