Feedback based on meeting.

- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.

code/datums/supplypacks.dm

@@ -890,15 +890,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	access = access_armory
 	group = "Security"
 
-/datum/supply_packs/randomised/automatic/hidden
-	name = "Assault weapon crate"
-	contains = list(
-			/obj/item/weapon/gun/projectile/automatic/bullpup,
-			/obj/item/weapon/gun/projectile/automatic/bullpup
-			)
-	cost = 100
-	hidden = 1
-
 /datum/supply_packs/randomised/autoammo
 	name = "Automatic weapon ammunition crate"
 	num_contained = 6
@@ -913,18 +904,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	access = access_armory
 	group = "Security"
 
-/datum/supply_packs/randomised/autoammo/hidden
-	name = "Assault weapon ammunition crate"
-	num_contained = 4
-	contains = list(
-			/obj/item/ammo_magazine/a556,
-			/obj/item/ammo_magazine/a556,
-			/obj/item/ammo_magazine/a556m,
-			/obj/item/ammo_magazine/a556m
-			)
-	hidden = 1
-	cost = 30
-
 /datum/supply_packs/energy_guns
 	name = "energy guns crate"
 	contains = list(/obj/item/weapon/gun/energy/gun = 2)

code/datums/uplink/visible_weapons.dm

@@ -39,19 +39,14 @@
 	item_cost = 5
 	path = /obj/item/weapon/gun/projectile/derringer
 
-/datum/uplink_item/item/visible_weapons/SVD
-	name = "Dragunov Sniper (7.62mm)"
-	item_cost = 7
-	path = /obj/item/weapon/gun/projectile/SVD
-
 /datum/uplink_item/item/visible_weapons/heavysniper
 	name = "Anti-Materiel Rifle (14.5mm)"
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
 	path = /obj/item/weapon/gun/projectile/heavysniper
 
 /datum/uplink_item/item/visible_weapons/tommygun
-	name = "Tommygun (.45)"
+	name = "Tommygun (.45)" // We're keeping this because it's CLASSY. -Spades
-	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
+	item_cost = 7
 	path = /obj/item/weapon/gun/projectile/automatic/tommygun
 
 //These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear.
@@ -68,7 +63,7 @@
 /datum/uplink_item/item/visible_weapons/bullpuprifle
 	name = "Assault Rifle (5.56mm)"
 	item_cost = 7
-	path = /obj/item/weapon/gun/projectile/automatic/bullpup
+	path = /obj/item/weapon/gun/projectile/automatic/carbine
 
 /datum/uplink_item/item/visible_weapons/combatshotgun
 	name = "Combat Shotgun"

code/game/antagonist/outsider/raider.dm

@@ -80,7 +80,7 @@ var/datum/antagonist/raider/raiders
 		/obj/item/weapon/gun/projectile/automatic/c20r,
 		/obj/item/weapon/gun/projectile/automatic/wt550,
 		/obj/item/weapon/gun/projectile/automatic/sts35,
-		/obj/item/weapon/gun/projectile/automatic/bullpup,
+		/obj/item/weapon/gun/projectile/automatic/carbine,
 		/obj/item/weapon/gun/projectile/automatic/p90,
 		/obj/item/weapon/gun/projectile/automatic/tommygun,
 		/obj/item/weapon/gun/projectile/silenced,
@@ -94,7 +94,6 @@ var/datum/antagonist/raider/raiders
 		/obj/item/weapon/gun/projectile/pistol,
 		/obj/item/weapon/gun/projectile/revolver,
 		/obj/item/weapon/gun/projectile/pirate,
-		/obj/item/weapon/gun/projectile/SVD,
 		/obj/item/weapon/gun/projectile/revolver/judge,
 		list(/obj/item/weapon/gun/projectile/luger,/obj/item/weapon/gun/projectile/luger/brown),
 		list(/obj/item/weapon/gun/projectile/deagle, /obj/item/weapon/gun/projectile/deagle/gold, /obj/item/weapon/gun/projectile/deagle/camo)

code/game/antagonist/station/renegade.dm

@@ -37,7 +37,7 @@ var/datum/antagonist/renegade/renegades
 		/obj/item/weapon/gun/projectile/automatic/mini_uzi,
 		/obj/item/weapon/gun/projectile/automatic/c20r,
 		/obj/item/weapon/gun/projectile/automatic/sts35,
-		/obj/item/weapon/gun/projectile/automatic/bullpup,
+		/obj/item/weapon/gun/projectile/automatic/carbine,
 		/obj/item/weapon/gun/projectile/automatic/wt550,
 		/obj/item/weapon/gun/projectile/automatic/z8,
 		/obj/item/weapon/gun/projectile/automatic/tommygun,

code/game/machinery/autolathe_datums.dm

@@ -372,11 +372,13 @@
 //////////////////
 
 /////// 5mm
+/*
 /datum/autolathe/recipe/pistol_5mm
 	name = "pistol magazine (5mm)"
 	path = /obj/item/ammo_magazine/c5mm
 	category = "Arms and Ammunition"
 	hidden = 1
+*/
 
 /datum/autolathe/recipe/smg_5mm
 	name = "top-mounted SMG magazine (5mm)"

code/modules/projectiles/ammunition/boxes.dm

@@ -157,6 +157,10 @@
 	name = "top mounted magazine (9mm rubber)"
 	ammo_type = /obj/item/ammo_casing/c9mmr
 
+/obj/item/ammo_magazine/mc9mmt/flash
+	name = "top mounted magazine (9mm flash)"
+	ammo_type = /obj/item/ammo_casing/c9mmf
+
 /obj/item/ammo_magazine/mc9mmt/practice
 	name = "top mounted magazine (9mm practice)"
 	ammo_type = /obj/item/ammo_casing/c9mmp

code/modules/projectiles/guns/projectile/automatic.dm

@@ -81,7 +81,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/wt550
 	name = "machine pistol"
-	desc = "The WT550 Saber is a cheap personal defense weapon mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds."
+	desc = "The WT550 Saber is a cheap self-defense weapon mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds."
 	icon_state = "wt550"
 	item_state = "wt550"
 	w_class = 3
@@ -103,9 +103,9 @@
 	return
 
 /obj/item/weapon/gun/projectile/automatic/z8
-	name = "\improper Z8 bullpup rifle"
+	name = "designated marksman rifle"
-	desc = "The Z8 Bulldog is an older model bullpup carbine, made by the now defunct Zendai Foundries. Uses armor piercing 5.56mm rounds. Makes you feel like a space marine when you hold it."
+	desc = "The Z8 Bulldog is an older model designated marksman rifle, made by the now defunct Zendai Foundries. Makes you feel like a space marine when you hold it, even though it can only hold 10 round magazines. Uses 5.56mm rounds and has an under barrel grenade launcher."
-	icon_state = "carbine"
+	icon_state = "carbine" // This isn't a carbine. :T
 	item_state = "z8carbine"
 	w_class = 4
 	force = 10
@@ -246,8 +246,8 @@
 	..()
 
 /obj/item/weapon/gun/projectile/automatic/as24
-	name = "\improper AS-24 automatic shotgun"
+	name = "automatic shotgun"
-	desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
+	desc = "The AS-24 is a durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
 	icon_state = "ashot"
 	item_state = null
 	w_class = 4
@@ -289,7 +289,7 @@
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=0),
-		list(mode_name="short bursts", burst=4, burst_delay=1, fire_delay=3, move_delay=3, burst_accuracy = list(0,-1,-1,-2), dispersion = list(0.6, 1.0, 1.0, 1.2))
+		list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0))
 		)
 
 /obj/item/weapon/gun/projectile/automatic/mini_uzi/update_icon()
@@ -300,8 +300,8 @@
 		icon_state = "mini-uzi-empty"
 
 /obj/item/weapon/gun/projectile/automatic/p90
-	name = "\improper H90K"
+	name = "personal defense weapon"
-	desc = "A compact, high capacity SMG produced by Hephaistos Industries. Despite its fierce reputation, it still manages to feel like a toy. Uses 5mm rounds."
+	desc = "The H90K is a compact, high capacity submachine gun produced by Hephaistos Industries. Despite its fierce reputation, it still manages to feel like a toy. Uses 5mm rounds."
 	icon_state = "p90smg"
 	item_state = "p90"
 	w_class = 3
@@ -315,7 +315,7 @@
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=0),
-		list(mode_name="short bursts", burst=5, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.2, 1.2)),
+		list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4,    burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0))
 		)
 
 /obj/item/weapon/gun/projectile/automatic/p90/update_icon()
@@ -343,8 +343,8 @@
 	icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty"
 //	update_held_icon()
 
-/obj/item/weapon/gun/projectile/automatic/bullpup
+/obj/item/weapon/gun/projectile/automatic/carbine
-	name = "\improper GP3000"
+	name = "assault carbine"
 	desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.56mm rounds."
 	icon_state = "bullpupm"
 	item_state = "bullpup"
@@ -364,7 +364,7 @@
 		list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6,    burst_accuracy=list(0,-1,-2), dispersion=list(0.0, 0.6, 0.6))
 		)
 
-/obj/item/weapon/gun/projectile/automatic/bullpup/update_icon(var/ignore_inhands)
+/obj/item/weapon/gun/projectile/automatic/carbine/update_icon(var/ignore_inhands)
 	..()
 	if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m))
 		icon_state = "bullpupm"

code/modules/projectiles/guns/projectile/pistol.dm

@@ -55,6 +55,7 @@
 	options["NT Mk. 58"] = "secguncomp"
 	options["NT Mk. 58 Custom"] = "secgundark"
 	options["Colt M1911"] = "colt"
+	options["FiveSeven"] = "fnseven"
 	options["USP"] = "usp"
 	options["H&K VP"] = "VP78"
 	options["P08 Luger"] = "p08"
@@ -133,6 +134,7 @@
 	icon_state = "deaglecamo"
 	item_state = "deagleg"
 
+/*
 /obj/item/weapon/gun/projectile/fiveseven
 	name = "\improper WT-AP57"
 	desc = "This tacticool pistol made by Ward-Takahashi trades stopping power for armor piercing and a high capacity. Uses 5mm rounds."
@@ -150,6 +152,7 @@
 		icon_state = "fnseven"
 	else
 		icon_state = "fnseven-empty"
+*/
 
 /obj/item/weapon/gun/projectile/gyropistol // Does this even appear anywhere outside of admin abuse?
 	name = "gyrojet pistol"

code/modules/projectiles/guns/projectile/sniper.dm

@@ -69,6 +69,7 @@
 
 ////////////// Dragunov Sniper Rifle //////////////
 
+/* // Commented out until it's not worthless.
 /obj/item/weapon/gun/projectile/SVD
 	name = "\improper Dragunov"
 	desc = "The SVD, also known as the Dragunov, was mass produced with an Optical Sniper Sight so simple that even Ivan can figure out how it works. Too bad for you that it's written in Russian. Uses 7.62mm rounds."
@@ -103,4 +104,4 @@
 	set name = "Use Scope"
 	set popup_menu = 1
 
-	toggle_scope(2.0)
+	toggle_scope(2.0)*/

html/changelogs/JerTheAce_GunsGunsGuns.yml

@@ -33,11 +33,11 @@ delete-after: True
 # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
 # Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
 changes: 
-  - rscadd: "Adds a variety of new guns, including the Dragunov Sniper, Mosin Nagant, Tommygun, and P08 Luger. Some of these guns and and their ammunition are purchasable through antag uplink, cargo, or can be spawned during Renegade or Heist modes."
   - rscadd: "Adds ammunition clips for reloading magazines and some guns (such as bolt-actions)."
   - rscadd: "All magazines and ammunitions can now be produced with the autolathe."
-  - maptweak: "P90 and FiveSeven are available in Asset Protection staging area on Polaris-2"
+  - maptweak: "New bullpup SMG is available in armory area on CentCom level."
   - tweak: "Revolvers now use 6 shots. Finally."
+  - tweak: "5.56 now does less damage, 7.62 does more, because previously it was backwards which made no sense."
   - tweak: "Most guns that didn't use magazines before for some reason (such as the Uzi) now use magazines."
   - tweak: "All casings now update icons if they have been spent."
   - tweak: "Corrects Pulse Rifle charge cost consistency."