From 468afa292dfaef7bcbc6df7b55cd0380582533a6 Mon Sep 17 00:00:00 2001
From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
Date: Fri, 3 Nov 2023 14:32:50 -0700
Subject: [PATCH] Adds the WT-551, Unskyrats the WT-550 ammo (#655)

## About The Pull Request


## The WT-551

![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/d57f5767-366e-4835-a5bf-d965b6b375a6)

This adds the WT-551. A remade version of the WT-550 that is worse in
every way. Fortunately, that means that it is balanced enough to be put
in NanoTrasen armories.

Compared tot he WT-551, it is bulkier and slightly slower (0.3 second
fire delay compared to 0.2). Additionally, it is commonly used with
rubber-tipped rounds or FlatHead rounds, which are a special surplus of
ammo that deals less damage and has no wounding, embedding, or
penetrative power. Regular ammo can be purchased from cargo or
researched later, with special ammo also being available later.

Note that this does not replace the WT-550.

## FlatHead ammo


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/81de4bdb-6fd6-4f23-a1b1-0af21e924c34)

Flathead ammo deals 18 brute damage (compared to the original 20), and 5
stamina damage per hit. It is extremely weak against armor, has no embed
chance, has virtually no wounding chance. It's perfect for cheap
corporate companies dealing with cheaper personnel. This is the type of
lethal ammo that security will use for the gun, unless someone speedruns
weapon research.


## Research Progression


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/26b72a1c-ebda-439a-98c9-9dc3168e01bd)

### Basic WT-550/WT-551 Ammunition.
Flathead rounds and Rubber rounds for the WT-550/WT-551 can be
researched for 2500 points after unlocking the "Weapon Development
Technology" node.

### Advanced WT-550/WT-551 Ammunition.
Regular rounds and AP rounds for the WT-550/WT-551 can be researched can
be researched for 5000 points after unlocking the "Advanced Weapon
Development Technology" and "Basic WT-550/WT-551 Ammunition" nodes.

### Illegal WT-550/WT-551 Ammunition.
Incendiary rounds for the WT-550/WT-551 can be researched can be
researched for 7500 points after unlocking the "Illegal Technology",
"Exotic Ammo" , and "Advanced WT-550/WT-551 Ammunition" nodes.

### Syndicate Research

Removes the WT-550 ammo from syndicate research since it is now
redundant.

## Cargo


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/a24e9df4-36e3-4368-b77a-cff06a42579f)

WT-551 rifles can be ordered in pairs (2) for the cost of a parrot, a
grilling starter pack, or a crab rocket (1600 credits). This value was
chosen because it is slightly higher than the thermal pistols, and the
traitor-ordered WT-550 rifle pack (which contains lethal ammo + spare
lethal ammo).

Additional FlatHead, Rubber, and Regular ammo can be ordered from cargo
as well.

Cargo techs no longer get WT-550s in the mail, but instead WT-551s (why
was this a thing holy shit).

## Armory


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/e88a37af-2e4f-4b1c-bc25-b9bed9e41b91)

2 WT-551s can be found in the armory.
For balance purposes one (1) laser rifle was removed.

## I hate Skyrat so much holy shit


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/b09eed34-77cd-4f37-8356-93688fec344e)

Unfucks the WT-550 ammo types by removing their dumb names and changed
caliber types.

Unfucks the WT-550 ammo in the ammo printer so that rubber rounds can be
printed at T0 and everything else (except incendiary rounds) can be
printed with the adv munitions disk.

The bullets for the WT-550 have been forcibly changed to /tg/ balance,
which means that any and all future Skyrat PRs cannot touch the damage
values for it (unless some fuckery occurs, idk).

## Why It's Good For The Game


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/395b9fa5-8380-46bc-96a7-06ce0931d8e7)


Security is in dire need of actual ballistics. /tg/ removed ballistics
from security because of reasons I legitimately don't think are valid.
It's also a huge balance concern for security not to have at least 1
ballistic weapon (other than the shotgun) because it doesn't stop antags
from hoarding laser immunity or meds.

Also guns are cool.

## Changelog

:cl: BurgerBB
add: Adds the WT-551 rifle, a redesign of the WT-550 rifle that is
balanced (citation needed) for security use.
add: Makes WT-550 ammo researchable and orderable from cargo. Removes
WT-550 ammo from syndicate research, and gives them their own
categories.
/:cl:

---------

Co-authored-by: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: ReturnToZender <donwest947@gmail.com>
---
 .../objects/effects/spawners/random/armory.dm |   7 ++-
 .../code/modules/cargo/exports/weapons.dm     |   7 +++
 .../code/modules/cargo/packs/security.dm      |  27 ++++++++
 .../jobs/job_types/cargo_technician.dm        |   4 ++
 .../mob/living/basic/trooper/nanotrasen.dm    |   3 +
 .../projectiles/ammunition/ballistic/smg.dm   |  37 +++++++++++
 .../boxes_magazines/external/smg.dm           |  24 +++++++
 .../projectiles/guns/ballistic/automatic.dm   |  19 ++++++
 .../projectiles/projectile/bullets/smg.dm     |  49 +++++++++++++++
 .../modules/research/techweb/all_nodes.dm     |  20 ++++++
 .../icons/obj/weapons/guns/wt551.dmi          | Bin 0 -> 616 bytes
 .../research/designs/weapon_designs.dm        |  59 ++++++++++++++++++
 .../sound/weapons/gun/wt551/shot.ogg          | Bin 0 -> 10271 bytes
 tgstation.dme                                 |   9 +++
 14 files changed, 262 insertions(+), 3 deletions(-)
 create mode 100644 modular_zubbers/code/modules/cargo/exports/weapons.dm
 create mode 100644 modular_zubbers/code/modules/cargo/packs/security.dm
 create mode 100644 modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm
 create mode 100644 modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm
 create mode 100644 modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm
 create mode 100644 modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm
 create mode 100644 modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm
 create mode 100644 modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm
 create mode 100644 modular_zubbers/icons/obj/weapons/guns/wt551.dmi
 create mode 100644 modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm
 create mode 100644 modular_zubbers/sound/weapons/gun/wt551/shot.ogg

diff --git a/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm b/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm
index 9f1d3845f2f..ebdb22a1d86 100644
--- a/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm
+++ b/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm
@@ -41,16 +41,17 @@
 
 /obj/effect/spawner/random/armory/laser_gun
 	loot = list(
-		/obj/item/gun/microfusion/mcr01
+		/obj/item/gun/ballistic/automatic/wt550/security/flathead
 	)
-	spawn_loot_count = 3
+	spawn_loot_count = 2
 
 /obj/effect/spawner/random/armory/e_gun
 	loot = list(
+		/obj/item/gun/microfusion/mcr01,
+		/obj/item/gun/microfusion/mcr01,
 		/obj/item/gun/energy/e_gun,
 		/obj/item/gun/energy/e_gun,
 		/obj/item/gun/energy/laser,
-		/obj/item/gun/energy/laser,
 	)
 	spawn_all_loot = TRUE
 
diff --git a/modular_zubbers/code/modules/cargo/exports/weapons.dm b/modular_zubbers/code/modules/cargo/exports/weapons.dm
new file mode 100644
index 00000000000..2bab3c4775e
--- /dev/null
+++ b/modular_zubbers/code/modules/cargo/exports/weapons.dm
@@ -0,0 +1,7 @@
+/datum/export/weapon/wt550
+	exclude_types = list(/obj/item/gun/ballistic/automatic/wt550/security)
+
+/datum/export/weapon/wt551
+	export_types = list(/obj/item/gun/ballistic/automatic/wt550/security)
+	cost = CARGO_CRATE_VALUE * 1.25
+	unit_name = "WT-551 automatic rifle"
\ No newline at end of file
diff --git a/modular_zubbers/code/modules/cargo/packs/security.dm b/modular_zubbers/code/modules/cargo/packs/security.dm
new file mode 100644
index 00000000000..a91550bdb3b
--- /dev/null
+++ b/modular_zubbers/code/modules/cargo/packs/security.dm
@@ -0,0 +1,27 @@
+/datum/supply_pack/security/armory/wt551
+	name = "WT-551 Autorifle Crate"
+	desc = "Contains a pair of WT-551 Autorifles pre-loaded with less-than-lethal rubber-tipped rounds. Additional ammo sold seperately. Backwards-compatible with WT-550 magazines. NanoTrasen reminds you that the other weapon is for a friend, and not for going guns akimbo."
+	cost = CARGO_CRATE_VALUE * 8
+	contains = list(/obj/item/gun/ballistic/automatic/wt550/security/rubber = 2)
+	crate_name = "wt-550 autorifle crate"
+
+/datum/supply_pack/security/armory/wt550_ammo_rubber
+	name = "WT-550/WT-551 Autorifle Ammo Crate (Rubber-Tipped)"
+	desc = "Contains 3 magazines with less than lethal rubber-tipped rounds for the WT-551."
+	cost = CARGO_CRATE_VALUE * 4
+	contains = list(/obj/item/ammo_box/magazine/wt550m9/rubber = 3)
+	crate_name = "wt-550 magazine crate (rubber-tipped)"
+
+/datum/supply_pack/security/armory/wt550_ammo_flat
+	name = "WT-550/WT-551 Autorifle Ammo Crate (Flat-Tipped)"
+	desc = "Contains 3 magazines with lethal flat-tipped rounds for the WT-551."
+	cost = CARGO_CRATE_VALUE * 5
+	contains = list(/obj/item/ammo_box/magazine/wt550m9/flathead = 3)
+	crate_name = "wt-550 magazine crate (flat-tipped)"
+
+/datum/supply_pack/security/armory/wt550_ammo_regular
+	name = "WT-550/WT-551 Autorifle Ammo Crate (Regular)"
+	desc = "Contains 3 magazines with lethal regular rounds for the WT-551."
+	cost = CARGO_CRATE_VALUE * 7
+	contains = list(/obj/item/ammo_box/magazine/wt550m9 = 3)
+	crate_name = "wt-550 magazine crate (regular)"
diff --git a/modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm b/modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm
new file mode 100644
index 00000000000..8eb12d250ea
--- /dev/null
+++ b/modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm
@@ -0,0 +1,4 @@
+/datum/job/cargo_technician/New()
+	mail_goodies -= /obj/item/gun/ballistic/automatic/wt550
+	mail_goodies += /obj/item/gun/ballistic/automatic/wt550/security
+	. = ..()
\ No newline at end of file
diff --git a/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm b/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm
new file mode 100644
index 00000000000..afa0f8a5af2
--- /dev/null
+++ b/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm
@@ -0,0 +1,3 @@
+/mob/living/basic/trooper/nanotrasen/ranged/smg
+	casingtype = /obj/item/ammo_casing/c46x30mm/flathead
+	r_hand = /obj/item/gun/ballistic/automatic/wt550/security
\ No newline at end of file
diff --git a/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm
new file mode 100644
index 00000000000..5fce7c34253
--- /dev/null
+++ b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm
@@ -0,0 +1,37 @@
+/obj/item/ammo_casing/c46x30mm
+	name = "4.6x30mm bullet casing"
+	desc = "A 4.6x30mm bullet casing."
+	can_be_printed = TRUE
+	advanced_print_req = TRUE
+	custom_materials = AMMO_MATS_BASIC
+
+/obj/item/ammo_casing/c46x30mm/ap
+	name = "4.6x30mm armor-piercing bullet casing"
+	desc = "A 4.6x30mm armor-piercing bullet casing."
+	can_be_printed = TRUE
+	advanced_print_req = TRUE
+	custom_materials = AMMO_MATS_AP
+
+/obj/item/ammo_casing/c46x30mm/inc
+	name = "4.6x30mm incendiary bullet casing"
+	desc = "A 4.6x30mm incendiary bullet casing."
+	can_be_printed = FALSE
+	advanced_print_req = TRUE
+	custom_materials = AMMO_MATS_TEMP
+
+/obj/item/ammo_casing/c46x30mm/flathead
+	name = "4.6x30mm flathead bullet casing"
+	desc = "A 4.6x30mm flathead bullet casing."
+	projectile_type = /obj/projectile/bullet/c46x30mm/flathead
+	can_be_printed = TRUE
+	advanced_print_req = FALSE
+	custom_materials = AMMO_MATS_RIPPER
+
+/obj/item/ammo_casing/c46x30mm/rubber
+	name = "4.6x30mm rubber-tipped bullet casing"
+	desc = "A 4.6x30mm rubber-tipped bullet casing."
+	projectile_type = /obj/projectile/bullet/c46x30mm/rubber
+	can_be_printed = TRUE
+	advanced_print_req = FALSE
+	harmful = FALSE
+	custom_materials = AMMO_MATS_BASIC
\ No newline at end of file
diff --git a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm
new file mode 100644
index 00000000000..b99817eb85c
--- /dev/null
+++ b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -0,0 +1,24 @@
+/obj/item/ammo_box/magazine/wt550m9
+	name = "\improper WT-550 magazine"
+
+/obj/item/ammo_box/magazine/wt550m9/wtap
+	name = "wt550 AP magazine"
+
+/obj/item/ammo_box/magazine/wt550m9/wtic
+	name = "wt550 INC magazine"
+
+/obj/item/ammo_box/magazine/wt550m9/flathead
+	name = "\improper WT-550 FlatHead magazine"
+	icon_state = "46x30mmt-20"
+	base_icon_state = "46x30mmt"
+	ammo_type = /obj/item/ammo_casing/c46x30mm/flathead
+	caliber = CALIBER_46X30MM
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/wt550m9/rubber
+	name = "\improper WT-550 Rubber magazine"
+	icon_state = "46x30mmt-20"
+	base_icon_state = "46x30mmt"
+	ammo_type = /obj/item/ammo_casing/c46x30mm/rubber
+	caliber = CALIBER_46X30MM
+	max_ammo = 20
diff --git a/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm b/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm
new file mode 100644
index 00000000000..6416ea3b945
--- /dev/null
+++ b/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -0,0 +1,19 @@
+/obj/item/gun/ballistic/automatic/wt550
+	can_bayonet = FALSE
+	can_suppress = FALSE
+
+/obj/item/gun/ballistic/automatic/wt550/security
+	name = "\improper WT-551 Autorifle"
+	desc = "A heavier, bulkier automatic variant of the WT-550, and now with 99% less discombobulation! It's back, baby. Uses 4.6x30mm rounds. Recommended to hold with two hands."
+	icon = 'modular_zubbers/icons/obj/weapons/guns/wt551.dmi'
+	fire_sound = 'modular_zubbers/sound/weapons/gun/wt551/shot.ogg'
+	w_class = WEIGHT_CLASS_BULKY
+	fire_delay = 3
+	//18 damage per 0.3 seconds = 60 DPS
+	//Reference: Laser Gun 22 damage per 0.4 seconds = 55DPS
+
+/obj/item/gun/ballistic/automatic/wt550/security/flathead //What you get in the armory.
+	spawn_magazine_type = /obj/item/ammo_box/magazine/wt550m9/flathead
+
+/obj/item/gun/ballistic/automatic/wt550/security/rubber //What you get from cargo.
+	spawn_magazine_type = /obj/item/ammo_box/magazine/wt550m9/rubber
\ No newline at end of file
diff --git a/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm b/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm
new file mode 100644
index 00000000000..b52a3913b88
--- /dev/null
+++ b/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm
@@ -0,0 +1,49 @@
+/obj/projectile/bullet/c46x30mm
+	name = "4.6x30mm bullet"
+	damage = 20
+	wound_bonus = -5
+	bare_wound_bonus = 5
+	embed_falloff_tile = -4
+
+/obj/projectile/bullet/c46x30mm/ap
+	name = "4.6x30mm armor-piercing bullet"
+	damage = 15
+	armour_penetration = 40
+	embedding = null
+
+/obj/projectile/bullet/incendiary/c46x30mm //Not a typo. /obj/projectile/bullet/incendiary is a type.
+	name = "4.6x30mm incendiary bullet"
+	damage = 10
+	fire_stacks = 1
+
+/obj/projectile/bullet/c46x30mm/flathead
+	name = "4.6x30mm flathead bullet"
+
+	damage = 18
+	stamina = 5 //Knocks the wind out of you.
+
+	wound_bonus = CANT_WOUND
+	bare_wound_bonus = CANT_WOUND
+
+	weak_against_armour = TRUE
+	sharpness = NONE
+	shrapnel_type = null
+	embedding = null
+
+/obj/projectile/bullet/c46x30mm/rubber
+	name = "4.6x30mm rubber-tipped bullet"
+	damage = 5
+	stamina = 15
+
+	wound_bonus = CANT_WOUND
+	bare_wound_bonus = CANT_WOUND
+
+	weak_against_armour = TRUE
+	sharpness = NONE
+	shrapnel_type = null
+	embedding = null
+
+	ricochets_max = 3
+	ricochet_incidence_leeway = 0
+	ricochet_chance = 75
+	ricochet_decay_damage = 0.8
\ No newline at end of file
diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm
index 67072dc4526..f4416b8f3ff 100644
--- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm
+++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm
@@ -46,3 +46,23 @@
 	design_ids += list(
 		"minesweeper",
 	)
+
+/datum/techweb_node/weaponry/New()
+	design_ids += "wt550_ammo_rubber"
+	design_ids += "wt550_ammo_flathead"
+	. = ..()
+
+/datum/techweb_node/adv_weaponry/New()
+	design_ids += "wt550_ammo_normal"
+	. = ..()
+
+/datum/techweb_node/exotic_ammo/New()
+	design_ids += "wt550_ammo_ap"
+	. = ..()
+
+/datum/techweb_node/syndicate_basic/New()
+	design_ids -= "mag_autorifle"
+	design_ids -= "mag_autorifle_ap"
+	design_ids -= "mag_autorifle_ic"
+	design_ids += "wt550_ammo_incendiary"
+	. = ..()
\ No newline at end of file
diff --git a/modular_zubbers/icons/obj/weapons/guns/wt551.dmi b/modular_zubbers/icons/obj/weapons/guns/wt551.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..62215f4de756d64d4342b4b8bb8599cdb0ffa8e8
GIT binary patch
literal 616
zcmV-u0+;=XP)<h;3K|Lk000e1NJLTq004jh003YJ0{{R3;-rdu0000^P)t-sz`(#M
zDJdBl88R|5GBG+G9UV$aN+~EU|I9NXAt4qP7A7Vp8X6iUB_#mx006K6@Bje1000vc
z6Brm692^`J6ciN|6(ArWK0ZFcz`(YyOSJ$100DGTPE!Ct=GbNc005_YR9JLGWpiV4
zX>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33t
zGfE(w;*!LYR3KBSyu{ShAikg|wJbBWT#1V_C9|j)C~nBbnO2mTn+jp0swPfVd}?k%
zNhNl*K*yw{<|I~vgmsM3HRdL!6KMrdWxSyQu?_;Mwjf2Z87YcQNKtHrQ?aswtDg%v
zCIRuDfj`^I3q$|_0ToF^K~!jg?bu;&f-n#UV7L>su+Hri-2eZjYb&X+upV2RX!L!W
zi1L!&wdohEDgXfR>U!<w_B^{j5$|r?&tRS}p8uKW;ks_xmiC7@h}tmBJYUqG=h^j}
zwqxc#tm!R$+KK5m<OLew&bkVA?)~U*xw3t)<*So^eEzM0rsE}%>(#i!q2wiYfUJm|
z&gauG5V^17m&<;PdS0M`M%=}?O(ymS%or25n)E!|Wh(GxNh+>H+$l4|G)T|0jpjN(
zyL}!-!o9fP8}e)yjs^aeXA7%J%&+BTXa!!Ofpi5eFVF#v$@#S$0002s2`v5}xJw87
zoAn0{aisI#q*DL@000000C)u2+dJOv0RR91p4B(h6%^Bh@ag{m0000<MNUMnLSTY+
CI0-=j

literal 0
HcmV?d00001

diff --git a/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm b/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm
new file mode 100644
index 00000000000..6ce2f82a60d
--- /dev/null
+++ b/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm
@@ -0,0 +1,59 @@
+/datum/design/wt550_ammo_rubber
+	name = "WT-550/WT-551 Magazine (4.6x30mm Rubber-Tipped) (Less-Than_Lethal)"
+	desc = "A magazine for the WT-550/WT-551 Autorifle. Contains less-than-lethal rubber-tipped ammo."
+	id = "wt550_ammo_rubber"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6)
+	build_path = /obj/item/ammo_box/magazine/wt550m9/rubber
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design/wt550_ammo_flat
+	name = "WT-550/WT-551 Magazine (4.6x30mm FlatHead) (Lethal)"
+	desc = "A magazine for the WT-550/WT-551 Autorifle. Contains lethal surplus-tier flathead ammo."
+	id = "wt550_ammo_flathead"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8)
+	build_path = /obj/item/ammo_box/magazine/wt550m9/rubber
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design/wt550_ammo
+	name = "WT-550/WT-551 Magazine (4.6x30mm Regular) (Lethal)"
+	desc = "A magazine for the WT-550/WT-551 Autorifle. Contains lethal regular ammo."
+	id = "wt550_ammo_normal"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10)
+	build_path = /obj/item/ammo_box/magazine/wt550m9
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design/wt550_ammo_ap
+	name = "WT-550/WT-551 Magazine (4.6x30mm Armor-Piercing) (Lethal)"
+	desc = "A magazine for the WT-550/WT-551 Autorifle. Contains lethal armor-piercing ammo. NanoTrasen prefers you didn't use these on your pressurized space station."
+	id = "wt550_ammo_ap"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 12, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2)
+	build_path = /obj/item/ammo_box/magazine/wt550m9/wtap
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design/wt550_ammo_incendiary
+	name = "WT-550/WT-551 Magazine (4.6x30mm Incendiary) (Extremely Lethal)"
+	desc = "A magazine for the WT-550/WT-551 Autorifle. Contains very lethal incendiary ammo. Consult your local laws for warcrime status before use."
+	id = "wt550_ammo_incendiary"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 2, /datum/material/silver = SHEET_MATERIAL_AMOUNT , /datum/material/glass = SHEET_MATERIAL_AMOUNT)
+	build_path = /obj/item/ammo_box/magazine/wt550m9/wtic
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
diff --git a/modular_zubbers/sound/weapons/gun/wt551/shot.ogg b/modular_zubbers/sound/weapons/gun/wt551/shot.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..74931deb9295bb8963c4a51c14a9c351efaf17ad
GIT binary patch
literal 10271
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

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index 14fdd3a648f..0617c75eeeb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7937,6 +7937,8 @@
 #include "modular_zubbers\code\modules\borer_hud\borer.dm"
 #include "modular_zubbers\code\modules\bsrpd\code\bsrpd.dm"
 #include "modular_zubbers\code\modules\cargo\bounties\blacksmith.dm"
+#include "modular_zubbers\code\modules\cargo\exports\weapons.dm"
+#include "modular_zubbers\code\modules\cargo\packs\security.dm"
 #include "modular_zubbers\code\modules\cargo\packs\service.dm"
 #include "modular_zubbers\code\modules\clothing\gloves\syndicate.dm"
 #include "modular_zubbers\code\modules\clothing\head\helmet.dm"
@@ -7973,6 +7975,7 @@
 #include "modular_zubbers\code\modules\hydroponics\plant_genes.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\blueshield.dm"
+#include "modular_zubbers\code\modules\jobs\job_types\cargo_technician.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\nanotrasen_consultant.dm"
 #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_glasses.dm"
 #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_gloves.dm"
@@ -7992,6 +7995,7 @@
 #include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories.dm"
 #include "modular_zubbers\code\modules\mob\living\examine.dm"
 #include "modular_zubbers\code\modules\mob\living\living.dm"
+#include "modular_zubbers\code\modules\mob\living\basic\trooper\nanotrasen.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\shadekin.dm"
 #include "modular_zubbers\code\modules\mob\living\silicon\robot\robot_defines.dm"
@@ -8007,7 +8011,11 @@
 #include "modular_zubbers\code\modules\pai\ghost_pai.dm"
 #include "modular_zubbers\code\modules\paperwork\fax.dm"
 #include "modular_zubbers\code\modules\power\supermatter\supermatter_gas.dm"
+#include "modular_zubbers\code\modules\projectiles\ammunition\ballistic\smg.dm"
+#include "modular_zubbers\code\modules\projectiles\boxes_magazines\external\smg.dm"
+#include "modular_zubbers\code\modules\projectiles\guns\ballistic\automatic.dm"
 #include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
+#include "modular_zubbers\code\modules\projectiles\projectile\bullets\smg.dm"
 #include "modular_zubbers\code\modules\protected_roles\code\antag_restricted_jobs.dm"
 #include "modular_zubbers\code\modules\reagents\drink_reagents.dm"
 #include "modular_zubbers\code\modules\reagents\reagent_containers\condiment.dm"
@@ -8048,6 +8056,7 @@
 #include "modular_zubbers\maps\offstation\dauntless\mob_spawns.dm"
 #include "modular_zubbers\master_files\code\modules\client\preferences\obscurity_examine.dm"
 #include "modular_zubbers\master_files\code\modules\research\designs\biogenerator_designs.dm"
+#include "modular_zubbers\master_files\code\modules\research\designs\weapon_designs.dm"
 #include "modular_zubbers\modules\ashwalkers\code\effects\ash_rituals.dm"
 #include "modular_zubbers\modules\automapper\code\area_spawn_entries.dm"
 #include "modular_zubbers\modules\cargoborg\code\robot_items.dm"