diff --git a/code/modules/projectiles/guns/bang/pistol.dm b/code/modules/projectiles/guns/bang/pistol.dm index 1b75ab4794a..3d6e57b0020 100644 --- a/code/modules/projectiles/guns/bang/pistol.dm +++ b/code/modules/projectiles/guns/bang/pistol.dm @@ -7,7 +7,8 @@ /obj/item/gun/bang/sec name = ".45 pistol" - desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses .45 rounds." + desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds." + description_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by Nanotrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of Nanotrasen security forces. It uses .45 rounds." icon_state = "secguncomp" pixel_offset_x = 28 pixel_offset_y = 14 @@ -16,7 +17,8 @@ name = ".45 signal pistol" /obj/item/gun/bang/sec/wood - desc = "A Nanotrasen designed sidearm, this one has a sweet wooden grip. Uses .45 rounds." + desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds." + description_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by Nanotrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of Nanotrasen security forces. This one has a wooden grip. It uses .45 rounds." name = "custom .45 Pistol" icon_state = "secgundark" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index bd54956a357..640c33c3e45 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -63,7 +63,8 @@ obj/item/gun/energy/retro /obj/item/gun/energy/lasercannon name = "laser cannon" - desc = "With the laser cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!" + desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon." + description_fluff = "The NT LC-4 is a laser cannon developed and produced by Nanotrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease." icon_state = "lasercannon" item_state = null fire_sound = 'sound/weapons/lasercannonfire.ogg' @@ -90,7 +91,8 @@ obj/item/gun/energy/retro /obj/item/gun/energy/xray name = "xray laser gun" - desc = "A high-power laser gun capable of expelling concentrated xray blasts." + desc = "A Nanotrasen designed high-power laser sidearm capable of expelling concentrated xray blasts." + description_fluff = "The NT XG-1 is a laser sidearm developed and produced by Nanotrasen. A recent invention, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover. It is compact with relatively high capacity to other sidearms." icon_state = "xray" item_state = "xray" fire_sound = 'sound/weapons/laser3.ogg' @@ -148,7 +150,8 @@ obj/item/gun/energy/retro /obj/item/gun/energy/laser/shotgun name = "quad-beam laser" - desc = "A modified laser weapon, designed to split a single beam four times." + desc = "A Nanotrasen designed laser weapon, designed to split a single beam four times." + description_fluff = "The NT QB-2 is a laser weapon developed and produced by Nanotrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four." icon_state = "oldenergykill" item_state = "energykill" fire_sound = 'sound/weapons/Laser.ogg' diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index db06acba475..9bf40dfe1e6 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -1,6 +1,7 @@ /obj/item/gun/energy/gun name = "energy carbine" - desc = "An energy-based carbine with two settings: Stun and kill." + desc = "A Nanotrasen designed energy-based carbine with two settings: Stun and kill." + description_fluff = "The NT EC-4 is an energy carbine developed and produced by Nanotrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy." icon_state = "energystun100" item_state = null // so the human update icon uses the icon_state instead. fire_sound = 'sound/weapons/Taser.ogg' @@ -118,7 +119,8 @@ /obj/item/gun/energy/pistol name = "energy pistol" - desc = "A basic energy-based pistol gun with two settings: Stun and kill." + desc = "A Nanotrasen energy-based pistol gun with two settings: Stun and kill." + description_fluff = "The NT EP-3 is an energy sidearm developed and produced by Nanotrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy." icon_state = "epistolstun100" item_state = null //so the human update icon uses the icon_state instead. fire_sound = 'sound/weapons/Taser.ogg' diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm index 743e0c15d92..78f551b04f3 100644 --- a/code/modules/projectiles/guns/energy/rifle.dm +++ b/code/modules/projectiles/guns/energy/rifle.dm @@ -1,6 +1,7 @@ /obj/item/gun/energy/rifle name = "energy rifle" - desc = "An energy-based rifle with two settings: stun and kill." + desc = "A Nanotrasen designed energy-based rifle with two settings: stun and kill." + description_fluff = "The NT ER-2 is an energy rifle developed and produced by Nanotrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability." icon_state = "eriflestun100" item_state = "elaser" //placeholder for now fire_sound = 'sound/weapons/Taser.ogg' @@ -36,7 +37,8 @@ /obj/item/gun/energy/rifle/laser name = "laser rifle" - desc = "A common laser weapon, designed to kill with concentrated energy blasts." + desc = "A Nanotrasen designed laser weapon, designed to kill with concentrated energy blasts." + description_fluff = "The NT LR-6 is a laser rifle developed and produced by Nanotrasen. Designed to kill with concentrated energy blasts focused through a crystal lens. It is considered to be the template of other standard laser weaponry." icon_state = "laserrifle" item_state = "laserrifle" fire_sound = 'sound/weapons/Laser.ogg' @@ -62,7 +64,8 @@ /obj/item/gun/energy/rifle/laser/heavy name = "laser cannon" - desc = "With the laser cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!" + desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon." + description_fluff = "The NT LC-4 is a laser cannon developed and produced by Nanotrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease." icon_state = "lasercannon" item_state = "lasercannon" fire_sound = 'sound/weapons/lasercannonfire.ogg' @@ -84,7 +87,8 @@ /obj/item/gun/energy/rifle/laser/xray name = "xray laser rifle" - desc = "A high-power laser rifle capable of expelling concentrated xray blasts." + desc = "A Nanotrasen designed high-power laser rifle capable of expelling concentrated xray blasts." + description_fluff = "The NT XR-1 is a laser firearm developed and produced by Nanotrasen. A recent innovation, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover, all the while having a large ammo capacity." icon_state = "xrifle" item_state = "xrifle" fire_sound = 'sound/weapons/laser3.ogg' diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 757c934bf65..06d2759d4f9 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -19,7 +19,8 @@ /obj/item/gun/energy/stunrevolver name = "stun revolver" - desc = "A high-tech revolver that fires rechargeable stun bolts." + desc = "A Hephaestus designed high-tech revolver that fires rechargable stun bolts." + description_fluff = "The ST-30 is a highly advanced sidearm produced by Hephaestus Industries. It is designed for self-defense in a less-than-lethal manner. While the weapon design itself is not groundbreaking, it fires high velocity energy bolts with rechargable cartridges, possessing unusual high stopping power. " icon_state = "stunrevolver" item_state = "stunrevolver" fire_sound = 'sound/weapons/gunshot/gunshot1.ogg' diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index b35e22e5365..a75a3e0d0f9 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -125,6 +125,7 @@ /obj/item/gun/projectile/automatic/rifle/sts35 name = "assault rifle" desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked." + description_fluff = "The STS35 is a durable, reliable and cheap to buy fully automatic assault rifle with many licensed manufacturers across the galaxy. It comes in different versions and calibres, this one uses 7.62 rounds. The manufacturer markings have been filed off." can_bayonet = TRUE knife_x_offset = 23 knife_y_offset = 13 diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 49ae49674b4..9ff3cbe20ce 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -40,7 +40,8 @@ /obj/item/gun/projectile/sec name = ".45 pistol" - desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses .45 rounds." + desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds." + description_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by Nanotrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of Nanotrasen security forces. It uses .45 rounds." icon_state = "secguncomp" magazine_type = /obj/item/ammo_magazine/c45m/rubber allowed_magazines = list(/obj/item/ammo_magazine/c45m) @@ -65,7 +66,8 @@ magazine_type = /obj/item/ammo_magazine/c45m/flash /obj/item/gun/projectile/sec/wood - desc = "A Nanotrasen designed sidearm, this one has a sweet wooden grip. Uses .45 rounds." + desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds." + description_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by Nanotrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of Nanotrasen security forces. This one has a wooden grip. It uses .45 rounds." name = "custom .45 Pistol" icon_state = "secgundark" diff --git a/html/changelogs/Aboshehab-Guns-Have-Flavor-Vol1.yml b/html/changelogs/Aboshehab-Guns-Have-Flavor-Vol1.yml new file mode 100644 index 00000000000..140d4e4b4b0 --- /dev/null +++ b/html/changelogs/Aboshehab-Guns-Have-Flavor-Vol1.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Aboshehab + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# 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: + - tweak: "Adjusted weapon description for a variety of firearms. Namely adding brand name, designer and fluff details reflected off the sprite and mechanical capability."