diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 032da28f989..298e02a2cdf 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -173,7 +173,7 @@ icon_state = "smg9mm-42" ammo_type = /obj/item/ammo_casing/c9mm caliber = "9mm" - max_ammo = 42 + max_ammo = 30 /obj/item/ammo_box/magazine/smgm9mm/ap name = "SMG magazine (Armour Piercing 9mm)" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 9dc38fe5ba6..cc7380659ce 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -127,6 +127,38 @@ icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]" return +/obj/item/weapon/gun/projectile/automatic/wt550/afterattack() + ..() + empty_alarm() + return + +/obj/item/weapon/gun/projectile/automatic/wt550hacked + name = "hacked auto rifle" + desc = "A illegally hacked and modified WT-550 auto rifle, using a illegal burst fire moduel. Uses 9mm rounds." + icon_state = "wt550hax" + item_state = "arg" + mag_type = /obj/item/ammo_box/magazine/wt550m9 + fire_delay = 2 + can_suppress = 0 + burst_size = 2 + pin = null + +/obj/item/weapon/gun/projectile/automatic/wt550hacked/ui_action_click() + return + +/obj/item/weapon/gun/projectile/automatic/wt550hacked/update_icon() + ..() + icon_state = "wt550hax[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]" + return + +/obj/item/weapon/gun/projectile/automatic/wt550hacked/afterattack() + ..() + empty_alarm() + return + +/obj/item/weapon/gun/projectile/automatic/wt550hacked/unrestricted + pin = /obj/item/device/firing_pin + /obj/item/weapon/gun/projectile/automatic/mini_uzi name = "\improper 'Type U3' Uzi" desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds." diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 371a0d7b01b..d835fbe5f88 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -135,6 +135,16 @@ build_path = /obj/item/weapon/gun/projectile/automatic/proto category = list("Weapons") +/datum/design/illegalwt550 + name = "Hacked WT-550" + desc = "A hacked varient of the WT-550. Has a illegally altered burst fire module attached." + id = "smg" + req_tech = list("combat" = 3, "materials" = 2, "syndicate" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 6000, MAT_GLASS = 2000, MAT_SILVER = 1000) + build_path = /obj/item/weapon/gun/projectile/automatic/wt550hacked + category = list("Weapons") + /datum/design/xray name = "Xray Laser Gun" desc = "Not quite as menacing as it sounds" @@ -188,31 +198,31 @@ category = list("Ammo") /datum/design/mag_oldsmg/ap_mag - name = "Submachine Gun Armour Piercing Magazine (9mmAP)" + name = "WT-550 Auto Gun Armour Piercing Magazine (9mmAP)" desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle" id = "mag_oldsmg_ap" - materials = list(MAT_METAL = 6000, MAG_SILVER = 200) + materials = list(MAT_METAL = 6000, MAT_SILVER = 200) build_path = /obj/item/ammo_box/magazine/wt550m9/wtap /datum/design/mag_oldsmg/ic_mag - name = "Submachine Gun Incindiary Magazine (9mmIC)" + name = "WT-550 Auto Gun Incendiary Magazine (9mmIC)" desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle" id = "mag_oldsmg_ic" - materials = list(MAT_METAL = 6000, MAG_SILVER = 200, MAT_GLASS = 800) + materials = list(MAT_METAL = 6000, MAT_SILVER = 200, MAT_GLASS = 800) build_path = /obj/item/ammo_box/magazine/wt550m9/wtic /datum/design/mag_oldsmg/tx_mag - name = "Submachine Gun Urnaium Magazine (9mmTX)" + name = "WT-550 Auto Gun Urnaium Magazine (9mmTX)" desc = "A 20 round urnaium tipped magazine for the out of date security WT-550 Auto Rifle" id = "mag_oldsmg_tx" - materials = list(MAT_METAL = 6000, MAG_SILVER = 400, MAG_URNAIUM = 2000) + materials = list(MAT_METAL = 6000, MAT_SILVER = 400, MAT_URNAIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx //SABR Mags /datum/design/mag_smg - name = "Submachine Gun Magazine (9mm)" - desc = "A 42-round magazine for the prototype submachine gun." + name = "SABR SMG Magazine (9mm)" + desc = "A 30-round magazine for the prototype submachine gun." id = "mag_smg" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE @@ -221,24 +231,24 @@ category = list("Ammo") /datum/design/mag_smg/ap_mag - name = "Submachine Gun Armour Piercing Magazine (9mmAP)" - desc = "A 42-round armour piercing magazine for the prototype submachine gun. Deals slightly less damage by bypasses most armour" + name = "SABR SMG Armour Piercing Magazine (9mmAP)" + desc = "A 30-round armour piercing magazine for the prototype submachine gun. Deals slightly less damage by bypasses most armour" id = "mag_smg_ap" - materials = list(MAT_METAL = 3000, MAG_SILVER = 100) + materials = list(MAT_METAL = 3000, MAT_SILVER = 100) build_path = /obj/item/ammo_box/magazine/smgm9mm/ap /datum/design/mag_smg/incin_mag - name = "Submachine Gun Incindiary Magazine (9mmIC)" - desc = "A 42-round incindiary round magazine for the prototype submachine gun. Deals significanlty less damage but sets the target on fire" + name = "SABR SMG Incendiary Magazine (9mmIC)" + desc = "A 30-round incindiary round magazine for the prototype submachine gun. Deals significanlty less damage but sets the target on fire" id = "mag_smg_ic" - materials = list(MAT_METAL = 3000, MAG_SILVER = 100, MAT_GLASS = 400) + materials = list(MAT_METAL = 3000, MAT_SILVER = 100, MAT_GLASS = 400) build_path = /obj/item/ammo_box/magazine/smgm9mm/fire /datum/design/mag_smg/incin_tox - name = "Submachine Gun Urnaium Magazine (9mmIC)" - desc = "A 42-round urnaium tipped round magazine for the prototype submachine gun. Deals toxin damage, but less overall damage." + name = "SABR SMG Urnaium Magazine (9mmTX)" + desc = "A 30-round urnaium tipped round magazine for the prototype submachine gun. Deals toxin damage, but less overall damage." id = "mag_smg_tx" - materials = list(MAT_METAL = 3000, MAT_GLASS = 200, MAG_URNAIUM = 1000) + materials = list(MAT_METAL = 3000, MAT_GLASS = 200, MAT_URNAIUM = 1000) build_path = /obj/item/ammo_box/magazine/smgm9mm/toxin /datum/design/stunshell diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index c71e05f382a..e0acb281783 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index fccdd933c43..89f6f6547f5 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index 72ef46c7163..a9efb0990f4 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ