diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 7943c483a3e..11a29758770 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -49,6 +49,9 @@
 	ammo_type = "/obj/item/ammo_casing/a12mm"
 	max_ammo = 30
 
+/obj/item/ammo_storage/box/c12mm/assault
+	ammo_type = "/obj/item/ammo_casing/a12mm/assault"
+
 /obj/item/ammo_storage/box/c45
 	name = "ammo box (.45)"
 	icon_state = "9mm"
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index 6c7aaab03e1..a19bfd32cbb 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -65,6 +65,9 @@
 	projectile_type = "/obj/item/projectile/bullet/midbullet"
 	w_type = RECYK_METAL
 
+/obj/item/ammo_casing/a12mm/assault
+	projectile_type = "/obj/item/projectile/bullet/midbullet/assault"
+
 /obj/item/ammo_casing/a12mm/bounce
 	desc = "A rubber-titanium 12mm bullet casing."
 	projectile_type = "/obj/item/projectile/bullet/midbullet/bouncebullet"
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index d35efb20ac0..788f4240f33 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -49,6 +49,9 @@
 	else
 		..()
 
+/obj/item/weapon/gun/projectile/automatic/lockbox
+	mag_type = "/obj/item/ammo_storage/magazine/smg9mm/empty"
+
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
 	name = "Uzi"
 	desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
@@ -103,13 +106,16 @@
 	max_shells = 20
 	burst_count = 4
 	caliber = list("12mm" = 1)
-	ammo_type = "/obj/item/ammo_casing/a12mm"
+	ammo_type = "/obj/item/ammo_casing/a12mm/assault"
 	mag_type = "/obj/item/ammo_storage/magazine/a12mm"
 	fire_sound = 'sound/weapons/Gunshot_c20.ogg'
 	load_method = 2
-
 	gun_flags = AUTOMAGDROP | EMPTYCASINGS
 
+/obj/item/weapon/gun/projectile/automatic/xcom/lockbox
+	mag_type = "/obj/item/ammo_storage/magazine/a12mm/empty"
+
+
 /obj/item/weapon/gun/projectile/automatic/l6_saw
 	name = "\improper L6 SAW"
 	desc = "A rather traditionally made light machine gun with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2531' engraved on the reciever"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 942c7dc0fee..68863d2100c 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -67,8 +67,15 @@
 	weaken = 0
 	superspeed = 1
 
+/obj/item/projectile/bullet/midbullet/assault
+	damage = 20
+	stun = 0
+	weaken = 0
+
 /obj/item/projectile/bullet/midbullet2
 	damage = 25
+	stun = 0
+	weaken = 0
 
 /obj/item/projectile/bullet/midbullet/bouncebullet
 	bounce_type = PROJREACT_WALLS|PROJREACT_WINDOWS
diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm
index 57982263d1c..5e9901ea6d6 100644
--- a/code/modules/research/designs/weapons.dm
+++ b/code/modules/research/designs/weapons.dm
@@ -100,9 +100,9 @@
 	id = "xcomar"
 	req_tech = list(Tc_COMBAT = 4, Tc_MATERIALS = 3)
 	build_type = PROTOLATHE
-	materials = list(MAT_IRON = 10000, MAT_GLASS = 1000)
+	materials = list(MAT_IRON = 12500, MAT_GLASS = 12500)
 	category = "Weapons"
-	build_path = /obj/item/weapon/gun/projectile/automatic/xcom
+	build_path = /obj/item/weapon/gun/projectile/automatic/xcom/lockbox
 	locked = 1
 	req_lock_access = list(access_armory)
 
@@ -112,9 +112,9 @@
 	id = "ammo_12mm"
 	req_tech = list(Tc_COMBAT = 3, Tc_MATERIALS = 2)
 	build_type = PROTOLATHE
-	materials = list(MAT_IRON = 2000, MAT_GLASS = 200)
+	materials = list(MAT_IRON = 4250, MAT_SILVER = 250)
 	category = "Weapons"
-	build_path = /obj/item/ammo_storage/box/c12mm
+	build_path = /obj/item/ammo_storage/box/c12mm/assault
 
 /datum/design/magazine_12mm
 	name = "Magazine (12mm)"
@@ -122,7 +122,7 @@
 	id = "magazine_12mm"
 	req_tech = list(Tc_COMBAT = 2)
 	build_type = PROTOLATHE
-	materials = list(MAT_IRON = 300)
+	materials = list(MAT_IRON = 400)
 	category = "Weapons"
 	build_path = /obj/item/ammo_storage/magazine/a12mm/empty
 
@@ -212,9 +212,9 @@
 	id = "smg"
 	req_tech = list(Tc_COMBAT = 4, Tc_MATERIALS = 3)
 	build_type = PROTOLATHE
-	materials = list(MAT_IRON = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000)
+	materials = list(MAT_IRON = 10000, MAT_GLASS = 10000)
 	category = "Weapons"
-	build_path = /obj/item/weapon/gun/projectile/automatic
+	build_path = /obj/item/weapon/gun/projectile/automatic/lockbox
 	locked = 1
 	req_lock_access = list(access_armory)
 
diff --git a/html/changelogs/icantthinkofanameritenow.yml b/html/changelogs/icantthinkofanameritenow.yml
new file mode 100644
index 00000000000..119664d5ab3
--- /dev/null
+++ b/html/changelogs/icantthinkofanameritenow.yml
@@ -0,0 +1,8 @@
+
+author: Icantthinkofanameritenow
+
+delete-after: True
+
+changes: 
+- rscadd: Assault Rifle does slightly more damage.
+- rscdel: "Price of Assault Rifle and ammunition increased, and Assault Rifle and SMG start with empty magazines. Assault Rifle shots no longer stun people."