diff --git a/TODO-commits.txt b/TODO-commits.txt
new file mode 100644
index 0000000000..6c34dd2fec
--- /dev/null
+++ b/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.
+
diff --git a/code/__DEFINES/guns.dm b/code/__DEFINES/guns.dm
index dba7ce93af..29a0dc66fd 100644
--- a/code/__DEFINES/guns.dm
+++ b/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."
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index aa165cbc81..ae892fd5d3 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/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
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index 3424b48b94..c48a3a9475 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/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"
diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm
index c50f906e4e..358bcf5a0d 100644
--- a/code/modules/projectiles/guns/ballistic/gauss.dm
+++ b/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"
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 5619b039d4..3242365176 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/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"
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index c4d505bcb1..e83bd46c5e 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/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,7 +59,7 @@ 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'
@@ -67,8 +67,8 @@ EMPTY_GUN_HELPER(automatic/pistol)
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)
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 954f9cb7fb..a887f14dee 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/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",
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 45b1e8b2de..bfa9be84b7 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/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,11 +157,11 @@
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"
@@ -169,4 +169,4 @@
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
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index e36dc8c67b..2d949f0374 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -58,8 +58,8 @@
// BRIMSTONE SHOTGUN //
/obj/item/gun/ballistic/shotgun/brimstone
- name = "HP Brimstone"
- desc = "A simple and sturdy pump-action shotgun sporting a 5-round capacity, manufactured by Hunter's Pride. Found widely throughout the Frontier in the hands of hunters, pirates, police, and countless others. Chambered in 12g."
+ name = "Brimstone P5"
+ desc = "A simple and sturdy pump-action shotgun sporting a 5-round capacity, manufactured by Hephaestus Industries. Found widely throughout the Frontier in the hands of hunters, pirates, police, and countless others. Chambered in 12g."
sawn_desc = "A stockless and shortened pump-action shotgun. The worsened recoil and accuracy make it a poor sidearm anywhere beyond punching distance."
fire_sound = 'sound/weapons/gun/shotgun/brimstone.ogg'
icon = 'icons/obj/guns/48x32guns.dmi'
@@ -70,9 +70,10 @@
default_firemode = FIREMODE_FULLAUTO
mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
- manufacturer = MANUFACTURER_HUNTERSPRIDE
+ manufacturer = MANUFACTURER_HEPHAESTUS
fire_delay = 0.05 SECONDS //slamfire
rack_delay = 0.2 SECONDS
+ fire_delay = 1
can_be_sawn_off = TRUE
@@ -94,8 +95,8 @@
// HELLFIRE SHOTGUN //
/obj/item/gun/ballistic/shotgun/hellfire
- name = "HP Hellfire"
- desc = "A hefty pump-action riot shotgun with a seven-round tube, manufactured by Hunter's Pride. Especially popular among the Frontier's police forces. Chambered in 12g."
+ name = "Hellfire P7"
+ desc = "A hefty pump-action riot shotgun with a seven-round tube, manufactured by Hephaestus Industries. Especially popular among the Frontier's police forces. Chambered in 12g."
icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "hellfire"
item_state = "hellfire"
@@ -104,6 +105,7 @@
can_be_sawn_off = TRUE
rack_sound = 'sound/weapons/gun/shotgun/rack_alt.ogg'
fire_delay = 0.1 SECONDS
+ manufacturer = MANUFACTURER_HEPHAESTUS
/obj/item/gun/ballistic/shotgun/hellfire/sawoff(mob/user)
. = ..()
@@ -131,7 +133,7 @@
wield_delay = 0.65 SECONDS
/obj/item/gun/ballistic/shotgun/automatic
- manufacturer = MANUFACTURER_NANOTRASEN
+ manufacturer = MANUFACTURER_HEPHAESTUS
/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user)
..()
@@ -256,7 +258,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
/obj/item/gun/ballistic/shotgun/bulldog/suns
name = "\improper Bulldog-C Shotgun"
- desc = "A variation of the Bulldog manufactured by Scarborough Arms for SUNS. Its shorter barrel is intended to provide additional maneuverability in personal defense scenarios."
+ desc = "A variation of the Bulldog manufactured by Scarborough Arms for private security. Its shorter barrel is intended to provide additional maneuverability in personal defense scenarios, making it a favorite among Roseus guards."
icon_state = "bulldog_suns"
item_state = "bulldog_suns"
@@ -427,6 +429,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
sawn_desc = "I'm just here for the gasoline."
unique_reskin = null
var/slung = FALSE
+ manufacturer = MANUFACTURER_NONE
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
..()
@@ -499,7 +502,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
icon_state = "cshotgunccc"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact/compact/compact
w_class = WEIGHT_CLASS_TINY
- sawn_desc = "Sigh. This is a trigger attached to a bullet."
+ sawn_desc = "Sigh. This is a trigger attached to a cartridge."
can_be_sawn_off = TRUE
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/compact/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index 5e8896ab10..83bceca821 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -79,7 +79,7 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
item_state = "cobra20"
/obj/item/gun/ballistic/automatic/smg/c20r/suns
- desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.' This one is painted in SUNS' colors."
+ desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.' Before being painted, this one was used as a film prop!"
icon_state = "c20r_suns"
item_state = "c20r_suns"
@@ -124,7 +124,7 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/vector
name = "\improper Vector carbine"
- desc = "A police carbine based on a pre-Night of Fire SMG design. Most of the complex workings have been removed for reliability. Chambered in 9mm."
+ desc = "A police carbine based on an ancient SMG design. Most of the complex workings have been removed for reliability. Chambered in 9mm."
icon_state = "vector"
item_state = "vector"
mag_type = /obj/item/ammo_box/magazine/smgm9mm //you guys remember when the autorifle was chambered in 9mm
@@ -212,8 +212,8 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/firestorm //weapon designed by Apogee-dev
- name = "HP Firestorm"
- desc = "An unconventional submachinegun, rarely issued to Saint-Roumain Militia mercenary hunters for outstanding situations where normal hunting weapons fall short. Chambered in .45."
+ name = "Firestorm .45"
+ desc = "An unconventional submachinegun designed by Hephaestus Industries. This model never really caught on, for some reason. Chambered in .45."
icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "firestorm"
item_state = "firestorm"
@@ -226,9 +226,7 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
bolt_type = BOLT_TYPE_OPEN
rack_sound = 'sound/weapons/gun/smg/uzi_cocked.ogg'
fire_sound = 'sound/weapons/gun/smg/firestorm.ogg'
-
-
- manufacturer = MANUFACTURER_HUNTERSPRIDE
+ manufacturer = MANUFACTURER_HEPHAESTUS
wield_slowdown = 0.4
/obj/item/gun/ballistic/automatic/smg/firestorm/pan //spawns with pan magazine, can take sticks instead of just drums, not sure where this would be used, maybe erts?
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 73d9104833..da087e528c 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -82,8 +82,8 @@
ammo_x_offset = 2
/obj/item/gun/energy/kinetic_accelerator/crossbow
- name = "mini energy crossbow"
- desc = "A weapon favored by syndicate stealth specialists."
+ name = "Crossbow model RIC"
+ desc = "A concealable crossbow that was once the weapon of choice for many Roseus Galactic infiltrators during the ICW due to its lack of noise, minimal weight, and self-charging capabilities."
icon_state = "crossbow"
item_state = "crossbow"
w_class = WEIGHT_CLASS_SMALL
@@ -97,7 +97,7 @@
unique_frequency = TRUE
can_flashlight = FALSE
max_mod_capacity = 0
- manufacturer = MANUFACTURER_SCARBOROUGH
+ manufacturer = MANUFACTURER_ROSEUS
/obj/item/gun/energy/kinetic_accelerator/crossbow/halloween
name = "candy corn crossbow"
@@ -107,14 +107,14 @@
ammo_type = list(/obj/item/ammo_casing/energy/bolt/halloween)
/obj/item/gun/energy/kinetic_accelerator/crossbow/large
- name = "energy crossbow"
- desc = "A reverse engineered weapon using syndicate technology."
+ name = "Crossbow model RIL"
+ desc = "An energy crossbow that was utilized by Roseus Galactic infiltrators early in the ICW, this one never became as popular as its successor due to its larger size."
icon_state = "crossbowlarge"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=4000)
suppressed = null
ammo_type = list(/obj/item/ammo_casing/energy/bolt/large)
- manufacturer = MANUFACTURER_NONE
+ manufacturer = MANUFACTURER_ROSEUS
/obj/item/gun/energy/plasmacutter
@@ -128,6 +128,7 @@
force = 12
sharpness = IS_SHARP
can_charge = FALSE
+ manufacturer = MANUFACTURER_HEPHAESTUS
heat = 3800
usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index fc11a632e0..6863f0e6a2 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -1,6 +1,6 @@
/obj/item/gun/energy/taser
name = "taser gun"
- desc = "A low-capacity, energy-based stun gun used by security teams to subdue targets at range."
+ desc = "A low-capacity, energy-based stun gun used by law enforcement to subdue targets at range."
icon_state = "taser"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
@@ -11,7 +11,7 @@
/obj/item/gun/energy/e_gun/advtaser
name = "hybrid taser"
- desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams."
+ desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams. Popular among military police regardless of nation."
icon_state = "advtaser"
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 2
@@ -49,6 +49,6 @@
/obj/item/gun/energy/disabler/e60
name = "E-60"
- desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
+ desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse. Popular among law enforcement in impoverished areas."
icon_state = "e60"
manufacturer = MANUFACTURER_EOEHOMA
diff --git a/code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm b/code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm
index 20a301a139..4e8da130fe 100644
--- a/code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm
+++ b/code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm
@@ -1,6 +1,6 @@
/obj/item/gun/energy/kalix //blue //todo: fix up belt_mirror.dmi, it's incomprehensible
name = "Etherbor BG-12"
- desc = "Brought to you by Etherbor Industries, proudly based within the PGF, is the BG-12 energy beam gun! The BG-12 is Etherbor's current newest civilian energy weapon model."
+ desc = "Brought to you by Etherbor Industries, proudly based within Epsilon Eridani, is the BG-12 energy beam gun! The BG-12 is Etherbor's current newest civilian energy weapon model."
icon_state = "kalixgun"
item_state = "kalixgun"
icon = 'icons/obj/guns/faction/gezena/energy.dmi'
@@ -44,7 +44,7 @@
/obj/item/gun/energy/kalix/pgf
name = "Etherbor BG-16"
- desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by Etherbor Industries as the standard-issue close-range weapon of the PGF."
+ desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by Etherbor Industries as the standard-issue close-range weapon of the Epsilon Eridani Defense Force."
icon_state = "pgfgun"
item_state = "pgfgun"
w_class = WEIGHT_CLASS_NORMAL
@@ -93,7 +93,7 @@
/obj/item/gun/energy/kalix/pgf/heavy
name = "Etherbor HBG-7"
- desc = "The HBG-7 is the standard-issue rifle weapon of the PGF. If the stopping power and fire rate isn't enough, it comes with a DMR mode that has greater armor piercing for dealing with armored targets."
+ desc = "The HBG-7 is the standard-issue rifle weapon of the Epsilon Eridani Defense Force. If the stopping power and fire rate isn't enough, it comes with a DMR mode that has greater armor piercing for dealing with armored targets."
icon_state = "pgfheavy"
item_state = "pgfheavy"
icon = 'icons/obj/guns/faction/gezena/48x32.dmi'
diff --git a/code/modules/projectiles/guns/misc/bow.dm b/code/modules/projectiles/guns/misc/bow.dm
index 9f2957ba40..1e81117d17 100644
--- a/code/modules/projectiles/guns/misc/bow.dm
+++ b/code/modules/projectiles/guns/misc/bow.dm
@@ -1,6 +1,6 @@
/obj/item/gun/ballistic/bow
name = "longbow"
- desc = "While pretty finely crafted, surely you can find something better to use in the current year."
+ desc = "A finely crafted, low-tech projectile-launching device. These have existed even longer than written history, and nobody knows the name of the original inventor."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "bow"
item_state = "pipebow"
diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/misc/medbeam.dm
index dd676a46d0..a238a7023a 100644
--- a/code/modules/projectiles/guns/misc/medbeam.dm
+++ b/code/modules/projectiles/guns/misc/medbeam.dm
@@ -1,6 +1,6 @@
/obj/item/gun/medbeam
name = "Medical Beamgun"
- desc = "Don't cross the streams!"
+ desc = "One of the most successful products by Cybersun Industries, the Medical Beamgun allows for a field medic to actively mend their allies while on the move. On the side it reads: WARNING! SAFETY HAZARD! DO NOT CROSS THE BEAMS!"
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"