Gun Lore Update

TODO-commits.txt

@@ -0,0 +1,40 @@
+
+X = compiles without errors
+- = introduces new compile errors
+^ = inherits compile errors; no new errors introduced
+@ = resolved without a cherry pick
+* = resolved
+
+[@] c88b2633a20c83dfba5ed401df7f975242d99664    Update from Shiptest on 2024-05-07
+[@] 8edf84f54790db070c9ec563ed1227f7cda13d75    Updating computers
+[@] 3db454e5d0cc9c77473bd552eab947103102dc77    Changing How Hallucinations work
+[*] 559492835f9ba8f4f9a95ceaff8407bb103414dc    Updating the Mecha Icons
+[*] 17197b2c53a05738c56a1e0cd5cab6259401700a    Code/modules/mob/living/simple animal/hostile /syndicate
+[*] e2e37e2857adfae1d4b0c30582ca4c8bf4f765d1    updated revolver
+[*] c7796a52eb4abfe0983a637fff0783efaf976fe1    Constructable Suit Storage Units part 1
+[*] 5cdc04bcba1d594878be878d80ab713cb67278c8    Constructable Suit Storage Units part 2
+[@] 69820b0b662fad1657dfa6fdb3cda9427cfc4a19    Constructable Suit Storage Units part 3
+[*] 2dab8af3a192f6705c4d42e3fcb2a558a47803d6    Constructable Suit Storage Units part 4 (final)
+[^] de71c609003df6a255c22d50fe47100f827f76fc    Gun Lore Update
+[^] 4b727c9f03905a2d113e169474f23f11433df546    Armor value changes
+[^] 17efcbf73d4e15789f90bddfacea6286f950ab4d    Defib cargo/station
+[^] 61d82bda46ee76216524c12f73f71832a789b6ba    secret documents randomization
+[^] 21162817d06e60b8bcce6a4c970a9577643236dc    soul removal 1
+[^] 5dbf574b2fe63c492f5a27d2f4b2d0c47201ad3b    Makes Sinta'Unathi playable again.
+[^] 11b7bc7ea21c875d3a1b419ae5d3acd83a40ef50    Ship spawn adjustments
+[-] fa0eb54c7a03fcddb94de87450d3df2fe7264a76    Kills-legion-disease-cause-its-bad-and-weird
+[^] 21709d390eef4fa1cbab5af1d8d0919b978f8173    Mindbreaker Tweak
+[^] a0ae6ee50f7dcc336843897d508128518a6b1245    Ports-a-super-small-TG-signal-optimization
+[^] 4bb50ced53aff3902a0c87bd47ae63887d5efa2d    makes-plant-analyzer-usable
+[^] d830853fa2cf567ad15a167242698a16b86546ed    no-more-ammo-boxes-in-sec-belts
+[^] ee1c8e30a5b4afa865a37b82173a509b12d829b7    Fix-shadow-AP-bonus
+[^] 55268e0620e0af5d2e5f9cb50246c72e173c9325    SSD-Indicators-Will-Be-Real-In-2020-
+[^] 21fe09b54c2d2fa776b0a47b55740d2411e63403    respriting egg boxes
+[^] f165b98f242246de7a2ed737c074f155e57ccbe0    Knife-visibility-quick-fix
+[^] 44764d96d10f46c5e37a89160a64621779a4a841    Ports-'Command-bar-typing-indicators-(client-side-html-version)
+[-] f50415cec86c0ec80bac750f2201b5291f1f49ee    restores ballistic.dm   [[[fixes 1 error]]]
+
+[-] fe043b3614603fe5d28c69cb2dfe12c08ea66a7c    --> Restoring missing files...?
+
+[-] cbdaaf98c0c1fb602cdcd9343fd127c286686808    I'm... rapidly losing confidence in this.
+

code/__DEFINES/guns.dm

@@ -60,7 +60,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"
@@ -70,6 +70,10 @@
 #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

@@ -151,7 +151,7 @@
 
 /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 HP Scout."
+	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
 

code/modules/cargo/packs/gun.dm

@@ -13,6 +13,29 @@
 	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 = 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)
+
+/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/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."
@@ -34,19 +57,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/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 the Saint Roumain Militia, chambered in .357."
+	desc = "Contains a concealable pepperbox revolver manufactured by Hunter's Pride and chambered in .357."
 	cost = 1250
 	contains = list(/obj/item/gun/ballistic/revolver/firebrand)
 
 /datum/supply_pack/gun/detrevolver
-	name = "Hunter's Pride Detective Revolver Crate"
-	desc = "Contains a concealable revolver favored by police departments around the sector, 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)
 
@@ -56,6 +85,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
@@ -93,14 +128,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"
@@ -164,7 +199,7 @@
 
 /datum/supply_pack/gun/cobra20
 	name = "Cobra-20 SMG Crate"
-	desc = "Contains a .45 submachine gun, manufactured by Scaraborough Arms and chambered in .45"
+	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"

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

@@ -49,10 +49,11 @@
 	fire_select_icon_state_prefix = "slug_"
 
 /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"
@@ -73,13 +74,13 @@
 	fire_select_icon_state_prefix = "pellet_"
 
 /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"
@@ -93,7 +94,7 @@
 
 	actions_types = list()
 	empty_indicator = FALSE
-	manufacturer = MANUFACTURER_SOLARARMORIES
+	manufacturer = MANUFACTURER_ROSEUS
 
 	gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
 	default_firemode = FIREMODE_SEMIAUTO
@@ -102,6 +103,6 @@
 	fire_select_icon_state_prefix = "lance_"
 
 /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

@@ -42,6 +42,7 @@
 	fire_delay = 0.4 SECONDS
 	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

@@ -44,12 +44,12 @@ EMPTY_GUN_HELPER(automatic/pistol)
 	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
@@ -59,16 +59,16 @@ EMPTY_GUN_HELPER(automatic/pistol)
 	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'
 	eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
 
 EMPTY_GUN_HELPER(automatic/pistol/candor)
 
-/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"
 
 EMPTY_GUN_HELPER(automatic/pistol/candor/factory)

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

@@ -472,7 +472,7 @@
 
 /obj/item/gun/ballistic/revolver/detective
 	name = "\improper HP Detective Special"
-	desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians as a cheap, compact sidearm. Uses .38 Special rounds."
+	desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians and local police forces as a cheap, compact sidearm. Uses .38 Special rounds."
 	fire_sound = 'sound/weapons/gun/revolver/shot_light.ogg'
 	icon_state = "detective"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
@@ -693,13 +693,13 @@ EMPTY_GUN_HELPER(revolver/detective)
 	safety_wording = "safety"
 
 /obj/item/gun/ballistic/revolver/shadow
-	name = "\improper HP Shadow"
+	name = "\improper Shadow 45"
 	desc = "A mid-size revolver. Despite the antiquated design, it is cheap, reliable, and stylish, making it a favorite among fast-drawing spacers and the officers of various militaries, as well as small-time police units. Chambered in .45."
 	fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
 	icon = 'icons/obj/guns/48x32guns.dmi'
 	icon_state = "shadow"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
-	manufacturer = MANUFACTURER_HUNTERSPRIDE
+	manufacturer = MANUFACTURER_HEPHAESTUS
 	obj_flags = UNIQUE_RENAME
 	gate_loaded = TRUE
 	unique_reskin = list("Shadow" = "shadow",

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

@@ -142,8 +142,8 @@
 	wield_delay = 1.3 SECONDS
 
 /obj/item/gun/ballistic/rifle/scout
-	name = "HP Scout"
-	desc = "A powerful bolt-action rifle usually given to mercenary hunters of the Saint-Roumain Militia, equally suited for taking down big game or two-legged game. Chambered in .300 Magnum."
+	name = "Scout 300M"
+	desc = "A powerful bolt-action rifle beloved by mercenaries and hunters alike, equally suited for taking down big game or two-legged game. Chambered in .300 Magnum."
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/smile
 	fire_sound = 'sound/weapons/gun/rifle/scout.ogg'
 
@@ -157,16 +157,16 @@
 	zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
 	zoom_out_amt = 5
 
-	manufacturer = MANUFACTURER_HUNTERSPRIDE
+	manufacturer = MANUFACTURER_HEPHAESTUS
 
 /obj/item/gun/ballistic/rifle/polymer
-	name = "polymer survivor rifle"
-	desc = "A bolt-action rifle made of scrap, desperation, and luck. Likely to shatter at any moment. Chambered in .300 Blackout."
+	name = "LK-MR Marksman Rifle"
+	desc = "A strange bolt-action rifle built with cheap materials. Nobody knows where, exactly, these came from, having mysteriously appeared among pirate crews near the end of the ICW. Chambered in .300 Blackout."
 	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "crackhead_rifle"
 	item_state = "crackhead_rifle"
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_NORMAL
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/polymer
 	can_be_sawn_off = FALSE
-	manufacturer = MANUFACTURER_NONE
+	manufacturer = MANUFACTURER_LAKVAR