From d18511eb72371ffe864e5e7ae57ed169d2a19bb6 Mon Sep 17 00:00:00 2001 From: Firecage Date: Wed, 21 Jan 2015 23:33:49 +0200 Subject: [PATCH 1/2] This removes the firing pin from the Prototype SMG, and adds the standard firing pin to its children where they need it. --- code/modules/projectiles/guns/projectile/automatic.dm | 2 ++ code/modules/projectiles/guns/projectile/launchers.dm | 2 ++ code/modules/projectiles/guns/projectile/pistol.dm | 1 + 3 files changed, 5 insertions(+) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index a72317ca466..5b09392925e 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -11,6 +11,7 @@ fire_delay = 2 var/select = 1 action_button_name = "Toggle Firemode" + pin = null /obj/item/weapon/gun/projectile/automatic/update_icon() ..() @@ -235,3 +236,4 @@ can_suppress = 0 burst_size = 4 fire_delay = 1 + pin = /obj/item/device/firing_pin \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index d5929c607e4..c1ac4c456e0 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -35,6 +35,7 @@ burst_size = 1 fire_delay = 0 action_button_name = null + pin = /obj/item/device/firing_pin /obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) ..() @@ -58,6 +59,7 @@ fire_delay = 0 select = 0 action_button_name = null + pin = /obj/item/device/firing_pin /obj/item/weapon/gun/projectile/automatic/speargun/update_icon() return diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 7e3635defc1..b3d338fae58 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -9,6 +9,7 @@ burst_size = 1 fire_delay = 0 action_button_name = null + pin = /obj/item/device/firing_pin /obj/item/weapon/gun/projectile/automatic/pistol/update_icon() ..() From 72af5ffb8feb5e3dcbce5264d461321007170a6f Mon Sep 17 00:00:00 2001 From: Firecage Date: Thu, 22 Jan 2015 08:08:14 +0200 Subject: [PATCH 2/2] Did what HG said to do with Protosmg firing pin --- .../projectiles/guns/projectile/automatic.dm | 17 +++++++++-------- .../projectiles/guns/projectile/launchers.dm | 2 -- .../projectiles/guns/projectile/pistol.dm | 1 - code/modules/research/designs/weapon_designs.dm | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 5b09392925e..8b331d13087 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -1,16 +1,18 @@ /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() @@ -235,5 +237,4 @@ fire_sound = 'sound/weapons/Gunshot_smg.ogg' can_suppress = 0 burst_size = 4 - fire_delay = 1 - pin = /obj/item/device/firing_pin \ No newline at end of file + fire_delay = 1 \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index c1ac4c456e0..d5929c607e4 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -35,7 +35,6 @@ burst_size = 1 fire_delay = 0 action_button_name = null - pin = /obj/item/device/firing_pin /obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) ..() @@ -59,7 +58,6 @@ fire_delay = 0 select = 0 action_button_name = null - pin = /obj/item/device/firing_pin /obj/item/weapon/gun/projectile/automatic/speargun/update_icon() return diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index b3d338fae58..7e3635defc1 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -9,7 +9,6 @@ burst_size = 1 fire_delay = 0 action_button_name = null - pin = /obj/item/device/firing_pin /obj/item/weapon/gun/projectile/automatic/pistol/update_icon() ..() diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index bee7bdac738..aeac82800b8 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -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