Merge pull request #55 from Starfly-13/GunLoreChanges

Gun Lore Update

code/__DEFINES/guns.dm

@@ -3,7 +3,7 @@
 #define MANUFACTURER_SHARPLITE "the Sharplite Defense logo"
 #define MANUFACTURER_SHARPLITE_NEW "the Nanotrasen-Sharplite logo"
 #define MANUFACTURER_HUNTERSPRIDE "the Hunter's Pride Arms and Ammunition logo"
-#define MANUFACTURER_SOLARARMORIES "the Solarbundswaffenkammer emblem"
+#define MANUFACTURER_SOLARARMORIES "the Solarian emblem"
 #define MANUFACTURER_SCARBOROUGH "the Scarborough Arms logo"
 #define MANUFACTURER_EOEHOMA "the Eoehoma Firearms emblem"
 #define MANUFACTURER_NANOTRASEN_OLD "an outdated Nanotrasen logo"
@@ -13,4 +13,8 @@
 #define MANUFACTURER_MINUTEMAN "the Lanchester City Firearms Plant logo"
 #define MANUFACTURER_DONKCO "the Donk! Co. logo"
 #define MANUFACTURER_PGF "the Etherbor Industries emblem"
+#define MANUFACTURER_ROSEUS "the Roseus Galactic logo"
+#define MANUFACTURER_ADHOMAI "a Tajaran emblem"
+#define MANUFACTURER_LAKVAR "the letters LKV"
+#define MANUFACTURER_HEPHAESTUS "the Hephaestus Industries logo"
 #define MANUFACTURER_IMPORT "Lanchester Import Co."

code/modules/cargo/packs/ammo.dm

@@ -143,6 +143,12 @@
 	contains = list(/obj/item/ammo_box/amagpellet_claris)
 	cost = 1000
 
+/datum/supply_pack/ammo/a300
+	name = ".300 Magnum Stripper Clip Crate"
+	desc = "Contains a five round .300 Magnum stripper clip for sniper rifles such as the Scout 300M."
+	contains = list(/obj/item/ammo_box/a300)
+	cost = 750
+
 /datum/supply_pack/ammo/ebr_ammo
 	name = "M514 EBR .308 Magazine Crate"
 	desc = "Contains a .308 magazine for the M514 EBR rifle, containing ten rounds."
@@ -173,6 +179,12 @@
 	contains = list(/obj/item/ammo_box/a762_40)
 	cost = 500
 
+/datum/supply_pack/ammo/a357_ammo_box
+	name = ".357 Ammo Box Crate"
+	desc = "Contains a fifty-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
+	contains = list(/obj/item/ammo_box/a357_box)
+	cost = 250
+
 /datum/supply_pack/ammo/c556mmHITP_ammo_box
 	name = "5.56 Caseless Ammo Box Crate"
 	desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
@@ -209,6 +221,12 @@
 	contains = list(/obj/item/ammo_box/c9mm/ap)
 	cost = 500
 
+/datum/supply_pack/ammo/a357match_ammo_box
+	name = ".357 Match Ammo Box Crate"
+	desc = "Contains a fifty-round .357 match box for better performance against armor."
+	contains = list(/obj/item/ammo_box/a357_box/match)
+	cost = 500
+
 /datum/supply_pack/ammo/c556mmHITPap_ammo_box
 	name = "5.56 caseless AP Ammo Box Crate"
 	desc = "Contains a fifty-round 5.56mm caseless boxloaded with armor piercing ammo."
@@ -233,6 +251,12 @@
 	contains = list(/obj/item/ammo_box/c9mm/hp)
 	cost = 500
 
+/datum/supply_pack/ammo/a357hp_ammo_box
+	name = ".357 HP Ammo Box Crate"
+	desc = "Contains a fifty-round .357 box loaded with hollow point ammo, great against unarmored targets."
+	contains = list(/obj/item/ammo_box/a357_box/hp)
+	cost = 500
+
 /datum/supply_pack/ammo/c10mmhp_ammo_box
 	name = "10mm HP Ammo Box Crate"
 	desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
@@ -305,6 +329,18 @@
 	contains = list(/obj/item/ammo_box/c8x50mmhp_box)
 	cost = 500
 
+/datum/supply_pack/ammo/a300_box
+	name = ".300 Ammo Box Crate"
+	desc = "Contains a twenty-round .300 Magnum ammo box for sniper rifles such as the HP Scout."
+	contains = list(/obj/item/ammo_box/a300_box)
+	cost = 500
+
+/datum/supply_pack/ammo/a4570_box
+	name = ".45-70 Ammo Box Crate"
+	desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition."
+	contains = list(/obj/item/ammo_box/a4570)
+	cost = 500
+
 /datum/supply_pack/ammo/ferropelletboxcrate
 	name = "Ferromagnetic Pellet Box Crate"
 	desc = "Contains a fifty-round ferromagnetic pellet ammo box for gauss guns such as the Claris."

code/modules/cargo/packs/gun.dm

@@ -7,15 +7,34 @@
 */
 
 /datum/supply_pack/gun/disposable
-	name = "Disposable Guns Crate"
+	name = "Disposable Gun Crate"
+	desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 200cr. That price is still far too high."
+	cost = 150
+	contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable)
+	crate_name = "disposable gun crate"
+
+/datum/supply_pack/gun/disposablebulk
+	name = "Bulk Disposable Guns Crate"
 	desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 400cr. That price is still far too high; this pack contains five."
-	cost = 750
+	cost = 700
 	contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable,
 					/obj/item/gun/ballistic/automatic/pistol/disposable,
 					/obj/item/gun/ballistic/automatic/pistol/disposable,
 					/obj/item/gun/ballistic/automatic/pistol/disposable,
 					/obj/item/gun/ballistic/automatic/pistol/disposable)
-	crate_name = "disposable gun crate"
+
+/datum/supply_pack/gun/derringer
+	name = ".38 Derringer Crate"
+	desc = "A cheap, concealable pistol manufactured by the reputable Hunter's Pride. At least it's better than a disposable pistol. Chambered in .38 rounds."
+	cost = 350
+	contains = list(/obj/item/gun/ballistic/derringer)
+	crate_name = "derringer crate"
+
+/datum/supply_pack/gun/revolver
+	name = "Scarborough Revolver Crate"
+	desc = "Contains a concealable Scarborough revolver, chambered in .357."
+	cost = 1250
+	contains = list(/obj/item/gun/ballistic/revolver)
 
 /datum/supply_pack/gun/commanders
 	name = "Commander Pistol Crate"
@@ -32,19 +51,25 @@
 
 /datum/supply_pack/gun/candors
 	name = "Candor Pistol Crate"
-	desc = "Contains a Candor pistol, the trusty sidearm of any spacer, produced by Hunter's Pride and chambered in .45 ACP."
-	cost = 1000
+	desc = "Contains a Candor pistol, the trusty sidearm of any spacer. Produced by Hephaestus Industries and chambered in .45 ACP."
+	cost = 2000
 	contains = list(/obj/item/gun/ballistic/automatic/pistol/candor)
 
-/datum/supply_pack/gun/revolver
-	name = "Scarborough Revolver Crate"
-	desc = "Contains a concealable Scarborough revolver, chambered in .357."
+/datum/supply_pack/gun/candorsnew
+	name = "Candor Pistol Crate"
+	desc = "Contains a Candor pistol, the trusty sidearm of any spacer. This one appears factory fresh! Produced by Hephaestus Industries and chambered in .45 ACP."
+	cost = 2000
+	contains = list(/obj/item/gun/ballistic/automatic/pistol/candor/factory)
+
+/datum/supply_pack/gun/pepperbox
+	name = "HP Firebrand Pepperbox Revolver Crate"
+	desc = "Contains a concealable pepperbox revolver manufactured by Hunter's Pride and chambered in .357."
 	cost = 1250
-	contains = list(/obj/item/gun/ballistic/revolver)
+	contains = list(/obj/item/gun/ballistic/revolver/firebrand)
 
 /datum/supply_pack/gun/detrevolver
-	name = "Hunter's Pride Detective Revolver Crate"
-	desc = "Contains a concealable Solarian revolver, chambered in .38."
+	name = "Detective Revolver Crate"
+	desc = "Contains a concealable revolver favored by Solarian systems, chambered in .38."
 	cost = 600
 	contains = list(/obj/item/gun/ballistic/revolver/detective)
 
@@ -54,6 +79,12 @@
 	cost = 1000
 	contains = list(/obj/item/gun/ballistic/revolver/shadow)
 
+/datum/supply_pack/gun/cobra20
+	name = "Cobra-20 SMG Crate"
+	desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
+	cost = 3000
+	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
+	crate_name = "SMG crate"
 
 /*
 		Energy
@@ -91,14 +122,14 @@
 
 /datum/supply_pack/gun/laser/kalix/pistol
 	name = "Etherbor SG-8 Beam Pistol Crate"
-	desc = "Contains a single SG-8 Beam Pistol, a civilian-grade sidearm developed in the PGF, manufactured by Etherbor Industries."
+	desc = "Contains a single SG-8 Beam Pistol, a civilian-grade sidearm developed in Epsilon Eridani, manufactured by Etherbor Industries."
 	cost = 1000
 	contains = list(/obj/item/gun/energy/kalix/pistol)
 	crate_name = "beam pistol crate"
 
 /datum/supply_pack/gun/laser/kalix
 	name = "Etherbor BG-12 Beam Rifle Crate"
-	desc = "Contains a single BG-12 Beam Rifle, a civilian-grade semi-automatic developed in the PGF, manufactured by Etherbor Industries."
+	desc = "Contains a single BG-12 Beam Rifle, a civilian-grade semi-automatic developed in Epsilon Eridani, manufactured by Etherbor Industries."
 	cost = 3000
 	contains = list(/obj/item/gun/energy/kalix)
 	crate_name = "beam rifle crate"
@@ -107,6 +138,13 @@
 		Shotguns
 */
 
+/datum/supply_pack/gun/doublebarrel_shotgun
+	name = "Double Barrel Shotgun Crate"
+	desc = "For when you need to deal with 2 drunkards the old-fashioned way. Contains a double-barreled shotgun, favored by Bartenders. Warranty voided if sawed off."
+	cost = 1000
+	contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel)
+	crate_name = "shotguns crate"
+
 /datum/supply_pack/gun/hellfire_shotgun
 	name = "Hellfire Shotgun Crate"
 	desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity."
@@ -132,20 +170,34 @@
 	contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow)
 	crate_name = "rifle crate"
 
-/datum/supply_pack/gun/cobra20
-	name = "Cobra-20 SMG Crate"
-	desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
-	cost = 3000
-	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
-	crate_name = "SMG crate"
-
 /datum/supply_pack/gun/illestren
 	name = "Illestren Rifle Crate"
 	desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds."
 	cost = 1250
 	contains = list(/obj/item/gun/ballistic/rifle/illestren)
 	crate_name = "rifle crate"
 
+/datum/supply_pack/gun/beacon
+	name = "Contender Break Action Rifle Crate"
+	desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off."
+	cost = 2250
+	contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel/beacon)
+	crate_name = "rifle crate"
+
+/datum/supply_pack/gun/scout
+	name = "Scout Sniper Rifle Crate"
+	desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
+	cost = 5500
+	contains = list(/obj/item/gun/ballistic/rifle/scout)
+	crate_name = "rifle crate"
+
+/datum/supply_pack/gun/cobra20
+	name = "Cobra-20 SMG Crate"
+	desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
+	cost = 3000
+	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
+	crate_name = "SMG crate"
+
 /datum/supply_pack/gun/wt550
 	name = "WT-550 Auto Rifle Crate"
 	desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -23,6 +23,28 @@
 	desc = "A 7-round speed loader for quickly reloading .357 revolvers. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
 	ammo_type = /obj/item/ammo_casing/a357/hp
 
+/obj/item/ammo_box/a357_box
+	name = "ammo box (.357)"
+	desc = "A box of standard .357 ammo."
+	icon_state = "357box"
+	ammo_type = /obj/item/ammo_casing/a357
+	max_ammo = 50
+
+/obj/item/ammo_box/a357_box/match
+	name = "ammo box (.357)"
+	desc = "A box of match .357 ammo."
+	icon_state = "357box-match"
+	ammo_type = /obj/item/ammo_casing/a357/match
+	max_ammo = 50
+
+/obj/item/ammo_box/a357_box/hp
+	name = "ammo box (.357)"
+	desc = "A box of hollow point .357 ammo."
+	icon_state = "357box-hp"
+	ammo_type = /obj/item/ammo_casing/a357/hp
+	max_ammo = 50
+
+
 // .45-70 Ammo Holders (Hunting Revolver)
 
 /obj/item/ammo_box/a4570
@@ -443,3 +465,10 @@
 	icon_state = "8x50mmbox-hp"
 	ammo_type = /obj/item/ammo_casing/a8_50rhp
 	max_ammo = 20
+
+/obj/item/ammo_box/a300_box
+	name = "ammo box (.300 Magnum)"
+	desc = "A box of standard .300 Magnum ammo."
+	icon_state = "300box"
+	ammo_type = /obj/item/ammo_casing/a300
+	max_ammo = 20

code/modules/projectiles/guns/ballistic/gauss.dm

@@ -47,10 +47,11 @@
 	spread_unwielded = 12
 
 /obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns
-	desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS."
+	desc = "A fully functional replica built by Roseus Galactic. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS."
 	mag_type = /obj/item/ammo_box/magazine/modelh
 	icon_state = "model-h_suns"
 	item_state = "model-h_suns"
+	manufacturer = MANUFACTURER_ROSEUS
 
 /obj/item/gun/ballistic/automatic/powered/gauss/claris
 	name = "Claris"
@@ -71,13 +72,13 @@
 	manufacturer = MANUFACTURER_SOLARARMORIES
 
 /obj/item/gun/ballistic/automatic/powered/gauss/claris/suns
-	desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended. Evidently, SUNS' founders echo the sentiment, as it appears to be painted in their colors."
+	desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended. This one is painted in the colors of Roseus Galactic."
 	icon_state = "claris_suns"
 	item_state = "claris_suns"
 
 /obj/item/gun/ballistic/automatic/powered/gauss/gar
-	name = "Solar 'GAR' Carbine"
-	desc = "A Solarian carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds."
+	name = "GAR Carbine"
+	desc = "A replica carbine with historical inaccuracies. Originally built by Roseus Galactic during the ICW, these have been seen in more than a few films. Launches ferromagnetic lances at alarming speeds."
 	mag_type = /obj/item/ammo_box/magazine/gar
 	icon = 'icons/obj/guns/48x32guns.dmi'
 	icon_state = "gar"
@@ -89,7 +90,7 @@
 	fire_delay = 1
 	actions_types = list()
 	empty_indicator = FALSE
-	manufacturer = MANUFACTURER_SOLARARMORIES
+	manufacturer = MANUFACTURER_ROSEUS
 
 	wield_delay = 0.7 SECONDS
 
@@ -98,6 +99,6 @@
 	AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
 
 /obj/item/gun/ballistic/automatic/powered/gauss/gar/suns
-	desc = "A Solarian carbine, unusually modern for its producers. It's just modern enough for SUNS, however, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds."
+	desc = "A Solarian carbine often used by Roseus Galactic security, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds."
 	icon_state = "gar_suns"
 	item_state = "gar_suns"

code/modules/projectiles/guns/ballistic/launchers.dm

@@ -38,6 +38,7 @@
 	fire_delay = 0
 	actions_types = list()
 	casing_ejector = FALSE
+	manufacturer = MANUFACTURER_HEPHAESTUS
 
 /obj/item/gun/ballistic/rocketlauncher
 	name = "\improper PML-9"

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

@@ -43,12 +43,12 @@
 	install_suppressor(S)
 
 /obj/item/gun/ballistic/automatic/pistol/suns
-	desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. It is painted in the colors of SUNS."
+	desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. It is painted in the colors of Roseus Galactic."
 	icon_state = "pistol_suns"
 
 /obj/item/gun/ballistic/automatic/pistol/candor
 	name = "\improper Candor"
-	desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45."
+	desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. Chambered in .45."
 	icon_state = "candor"
 	item_state = "hp_generic"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -58,7 +58,7 @@
 	rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
 	lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
 	bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
-	manufacturer = MANUFACTURER_HUNTERSPRIDE
+	manufacturer = MANUFACTURER_HEPHAESTUS
 	load_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
 	load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
 	eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
@@ -68,8 +68,8 @@
 /obj/item/gun/ballistic/automatic/pistol/candor/no_mag
 	spawnwithmagazine = FALSE
 
-/obj/item/gun/ballistic/automatic/pistol/candor/factory //also give this to the srm, their candors should probably look factory fresh from how well taken care of they are
-	desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
+/obj/item/gun/ballistic/automatic/pistol/candor/factory //This will be sold on the marketplace.
+	desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
 	item_state = "hp_generic_fresh"
 
 /obj/item/gun/ballistic/automatic/pistol/candor/factory/update_overlays()