Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/external/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
icon_state = "46x30mmt-20"
ammo_type = /obj/item/ammo_casing/c46x30mm
caliber = "4.6x30mm"
max_ammo = 20
max_ammo = 22

/obj/item/ammo_box/magazine/wt550m9/update_icon()
..()
Expand Down
5 changes: 3 additions & 2 deletions code/modules/projectiles/guns/ballistic/automatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@

/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
weapon_weight = WEAPON_MEDIUM
can_suppress = FALSE
can_bayonet = TRUE
knife_x_offset = 25
Expand Down
10 changes: 5 additions & 5 deletions code/modules/projectiles/projectile/bullets/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions code/modules/research/designs/weapon_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 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)
Expand All @@ -320,23 +320,23 @@

/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 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
departmental_flags = DEPARTMENTAL_FLAG_ARMORY

/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 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
departmental_flags = DEPARTMENTAL_FLAG_ARMORY

/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 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
Expand Down