diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 3f06071e2f..ced50484ce 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -3,7 +3,7 @@ # An explaination of the naming format for guns and ammo: # # a = Ammo, as in individual rounds of ammunition. -# b = Box, intended to have ammo taken out one at a time by hand. +# b = Box, intended to have ammo taken out one at a time by hand. Really obsolete. Don't use this. # c = Clips, intended to reload magazines or guns quickly. # m = Magazine, intended to hold rounds of ammo. # s = Speedloaders, intended to reload guns quickly. @@ -328,31 +328,19 @@ name = "ammo clip (.45 flash)" ammo_type = /obj/item/ammo_casing/a9mm/flash -/obj/item/ammo_magazine/box/c9mm // Made by RnD for Prototype SMG and should probably be removed because why does it require DIAMONDS to make bullets? - name = "ammunition Box (9mm)" - icon_state = "9mm" - origin_tech = list(TECH_COMBAT = 2) - matter = list(DEFAULT_WALL_MATERIAL = 1800) - caliber = "9mm" - ammo_type = /obj/item/ammo_casing/a9mm - max_ammo = 30 - -/obj/item/ammo_magazine/box/c9mm/empty - initial_ammo = 0 - -/obj/item/ammo_magazine/m9mmR/saber - desc = "A very high capacity double stack magazine made specially for the SABER SMG. Filled with 22 9mm bullets." +/obj/item/ammo_magazine/m9mmAdvanced + desc = "A very high capacity double stack magazine made specially for the Advanced SMG. Filled with 21 9mm bullets." icon_state = "S9mm" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/a9mm matter = list(DEFAULT_WALL_MATERIAL = 1200) caliber = "9mm" - max_ammo = 22 + max_ammo = 21 origin_tech = list(TECH_COMBAT = 2, TECH_ILLEGAL = 1) multiple_sprites = 1 -/obj/item/ammo_magazine/m9mmR/saber/ap - desc = "A high capacity double stack magazine made specially for the SABER SMG. Filled with 22 9mm armor piercing bullets." +/obj/item/ammo_magazine/m9mmAdvanced/ap + desc = "A high capacity double stack magazine made specially for the Advanced SMG. Filled with 21 9mm armor piercing bullets." icon_state = "S9mm" ammo_type = /obj/item/ammo_casing/a9mm/ap matter = list(DEFAULT_WALL_MATERIAL = 2000) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index ddb92f1b41..a9d3125253 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -13,29 +13,32 @@ list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0))) -/obj/item/weapon/gun/projectile/automatic/saber //Fixed it - name = "prototype SMG" - desc = "A protoype lightweight, fast firing gun. Uses 9mm rounds." +/obj/item/weapon/gun/projectile/automatic/advanced_smg + name = "advanced SMG" + desc = "An advanced submachine gun with a reflective laser optic that makes burst fire less inaccurate than other SMGs. Uses 9mm rounds." icon = 'icons/obj/gun.dmi' - icon_state = "saber"//Still ugly + icon_state = "advanced_smg-empty" w_class = ITEMSIZE_NORMAL - load_method = MAGAZINE //This should fix it - max_shells = 22 + load_method = MAGAZINE caliber = "9mm" origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) slot_flags = SLOT_BELT - magazine_type = /obj/item/ammo_magazine/m9mmR/saber - allowed_magazines = list(/obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber/ap) - projectile_type = /obj/item/projectile/bullet/pistol - multi_aim = 1 - burst_delay = 2 + magazine_type = null // R&D builds this. Starts unloaded. + allowed_magazines = list(/obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mm) firemodes = list( list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), - list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)) - // list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15,-30,-30), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2)), + list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6)) ) +/obj/item/weapon/gun/projectile/automatic/advanced_smg/update_icon() + ..() + icon_state = (ammo_magazine)? "advanced_smg" : "advanced_smg-empty" + return + +/obj/item/weapon/gun/projectile/automatic/advanced_smg/loaded + magazine_type = /obj/item/ammo_magazine/m9mmAdvanced + /obj/item/weapon/gun/projectile/automatic/c20r name = "submachine gun" desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. It has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock. Uses 10mm rounds." diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index 828856aeba..6f5bf1e7b4 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -45,19 +45,20 @@ build_path = /obj/item/weapon/gun/energy/decloner sort_string = "TAAAE" -/datum/design/item/weapon/smg +/datum/design/item/weapon/advanced_smg id = "smg" - desc = "An compact reliable SMG firing armor piercing ammo." + desc = "An advanced 9mm SMG with a reflective laser optic." req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) materials = list(DEFAULT_WALL_MATERIAL = 8000, "silver" = 2000, "diamond" = 1000) - build_path = /obj/item/weapon/gun/projectile/automatic/saber + build_path = /obj/item/weapon/gun/projectile/automatic/advanced_smg sort_string = "TAABA" -/datum/design/item/weapon/ammo_9mm +/datum/design/item/weapon/ammo_9mmAdvanced id = "ammo_9mm" + desc = "A 21 round magazine for an advanced 9mm SMG." req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) - materials = list(DEFAULT_WALL_MATERIAL = 3750, "silver" = 100) - build_path = /obj/item/ammo_magazine/box/c9mm + materials = list(DEFAULT_WALL_MATERIAL = 3750, "silver" = 100) // Requires silver for proprietary magazines! Or something. + build_path = /obj/item/ammo_magazine/m9mmAdvanced sort_string = "TAACA" /datum/design/item/weapon/stunshell @@ -190,4 +191,4 @@ req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4) materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 2000, "silver" = 1000, "diamond" = 750) build_path = /obj/item/weapon/gun/energy/phasegun/cannon - sort_string = "TPAAD" \ No newline at end of file + sort_string = "TPAAD"