Merge pull request #7265 from Firecage/ProtoSMGpin

Fixes proto SMG having a firing pin.
This commit is contained in:
Swag McYolosteinen
2015-01-23 17:48:21 +01:00
2 changed files with 11 additions and 8 deletions
@@ -1,17 +1,20 @@
/obj/item/weapon/gun/projectile/automatic
name = "prototype SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
w_class = 3
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
w_class = 3
var/alarmed = 0
var/select = 1
can_suppress = 1
burst_size = 3
fire_delay = 2
var/select = 1
action_button_name = "Toggle Firemode"
/obj/item/weapon/gun/projectile/automatic/proto
name = "prototype SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
pin = null
/obj/item/weapon/gun/projectile/automatic/update_icon()
..()
overlays.Cut()
@@ -234,4 +237,4 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
burst_size = 4
fire_delay = 1
fire_delay = 1
@@ -132,7 +132,7 @@
req_tech = list("combat" = 4, "materials" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 8000, "$silver" = 2000, "$diamond" = 1000)
build_path = /obj/item/weapon/gun/projectile/automatic
build_path = /obj/item/weapon/gun/projectile/automatic/proto
category = list("Weapons")
/datum/design/xray