From 115a7c302e0bc44370c206339ab994be785bc495 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Tue, 14 Jun 2022 16:27:03 -0500 Subject: [PATCH 1/3] gun go pew pew = fun --- .../projectiles/boxes_magazines/external/smg.dm | 2 +- code/modules/projectiles/guns/ballistic/automatic.dm | 4 ++-- code/modules/projectiles/projectile/bullets/smg.dm | 10 +++++----- code/modules/research/designs/weapon_designs.dm | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index ae0322de805b..ef626730521b 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -3,7 +3,7 @@ icon_state = "46x30mmt-20" ammo_type = /obj/item/ammo_casing/c46x30mm caliber = "4.6x30mm" - max_ammo = 20 + max_ammo = 26 /obj/item/ammo_box/magazine/wt550m9/update_icon() ..() diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index ee3e270b34d8..096aeef0b171 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -83,12 +83,12 @@ /obj/item/gun/ballistic/automatic/wt550 name = "security auto rifle" - desc = "An outdated personal defence weapon. Uses 4.6x30mm rounds and is designated the WT-550 Automatic Rifle. Has a single fire burst mode, but you still can't figure out what advantage that has over semi automatic." + desc = "An outdated personal defence weapon. Uses 4.6x30mm rounds and is designated the WT-550 Automatic Rifle. Has a two-round burst or a semi-automatic firing mode." icon_state = "wt550" item_state = "arg" mag_type = /obj/item/ammo_box/magazine/wt550m9 fire_delay = 2 - burst_size = 1 + burst_size = 2 can_suppress = FALSE can_bayonet = TRUE knife_x_offset = 25 diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index ba380e30df28..b0d45465a4ab 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -10,22 +10,22 @@ /obj/item/projectile/bullet/c46x30mm name = "4.6x30mm bullet" - damage = 20 + damage = 13 wound_bonus = -5 bare_wound_bonus = 5 armour_penetration = 20 /obj/item/projectile/bullet/c46x30mm_ap name = "4.6x30mm armor-piercing bullet" - damage = 15 + damage = 10 armour_penetration = 50 /obj/item/projectile/bullet/incendiary/c46x30mm name = "4.6x30mm incendiary bullet" - damage = 10 + damage = 7 fire_stacks = 1 /obj/item/projectile/bullet/c46x30mm_rubber name = "4.6x30mm rubber bullet" - damage = 5 - stamina = 20 //slightly more effective than the detective's revolver when fired in bursts + damage = 4 + stamina = 21 //slightly more effective than the detective's revolver when fired in bursts diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 7028911e967e..a876572bd747 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -310,7 +310,7 @@ /datum/design/mag_oldsmg name = "WT-550 Auto Gun Magazine (4.6x30mm)" - desc = "A 20 round magazine for the out of date security WT-550 Auto Rifle." + desc = "A 26 round magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg" build_type = PROTOLATHE materials = list(/datum/material/iron = 4000) @@ -320,7 +320,7 @@ /datum/design/mag_oldsmg/ap_mag name = "WT-550 Auto Gun Armour Piercing Magazine (4.6x30mm AP)" - desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle." + desc = "A 26 round armour piercing magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg_ap" materials = list(/datum/material/iron = 6000, /datum/material/silver = 600) build_path = /obj/item/ammo_box/magazine/wt550m9/wtap @@ -328,7 +328,7 @@ /datum/design/mag_oldsmg/ic_mag name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" - desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle." + desc = "A 26 round armour piercing magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg_ic" materials = list(/datum/material/iron = 6000, /datum/material/silver = 600, /datum/material/glass = 1000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtic @@ -336,7 +336,7 @@ /datum/design/mag_oldsmg/rubber_mag name = "WT-550 Auto Gun Rubber Bullet Magazine (4.6x30mm Rubber)" - desc = "A 20 round rubber bullet magazine for the out of date security WT-550 Auto Rifle." + desc = "A 26 round rubber bullet magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg_rubber" materials = list(/datum/material/iron = 4000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtr From dc910b39d046eb076e6cf2c4ebf954279865d463 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Thu, 16 Jun 2022 14:46:32 -0500 Subject: [PATCH 2/3] 22 is symmetrical --- code/modules/projectiles/boxes_magazines/external/smg.dm | 2 +- code/modules/research/designs/weapon_designs.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index ef626730521b..83dd669e488c 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -3,7 +3,7 @@ icon_state = "46x30mmt-20" ammo_type = /obj/item/ammo_casing/c46x30mm caliber = "4.6x30mm" - max_ammo = 26 + max_ammo = 22 /obj/item/ammo_box/magazine/wt550m9/update_icon() ..() diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index a876572bd747..567ba415525f 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -310,7 +310,7 @@ /datum/design/mag_oldsmg name = "WT-550 Auto Gun Magazine (4.6x30mm)" - desc = "A 26 round magazine for the out of date security WT-550 Auto Rifle." + desc = "A 22 round magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg" build_type = PROTOLATHE materials = list(/datum/material/iron = 4000) @@ -320,7 +320,7 @@ /datum/design/mag_oldsmg/ap_mag name = "WT-550 Auto Gun Armour Piercing Magazine (4.6x30mm AP)" - desc = "A 26 round armour piercing magazine for the out of date security WT-550 Auto Rifle." + desc = "A 22 round armour piercing magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg_ap" materials = list(/datum/material/iron = 6000, /datum/material/silver = 600) build_path = /obj/item/ammo_box/magazine/wt550m9/wtap @@ -328,7 +328,7 @@ /datum/design/mag_oldsmg/ic_mag name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" - desc = "A 26 round armour piercing magazine for the out of date security WT-550 Auto Rifle." + desc = "A 22 round armour piercing magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg_ic" materials = list(/datum/material/iron = 6000, /datum/material/silver = 600, /datum/material/glass = 1000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtic @@ -336,7 +336,7 @@ /datum/design/mag_oldsmg/rubber_mag name = "WT-550 Auto Gun Rubber Bullet Magazine (4.6x30mm Rubber)" - desc = "A 26 round rubber bullet magazine for the out of date security WT-550 Auto Rifle." + desc = "A 22 round rubber bullet magazine for the out of date security WT-550 Auto Rifle." id = "mag_oldsmg_rubber" materials = list(/datum/material/iron = 4000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtr From 428e8db8a86062c4dad2d4c206d647522f2a557a Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 19 Jun 2022 06:06:52 -0400 Subject: [PATCH 3/3] Update code/modules/projectiles/guns/ballistic/automatic.dm --- code/modules/projectiles/guns/ballistic/automatic.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 096aeef0b171..633418ed4441 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -89,6 +89,7 @@ mag_type = /obj/item/ammo_box/magazine/wt550m9 fire_delay = 2 burst_size = 2 + weapon_weight = WEAPON_MEDIUM can_suppress = FALSE can_bayonet = TRUE knife_x_offset = 25