Skip to content

Commit

Permalink
guh
Browse files Browse the repository at this point in the history
  • Loading branch information
solwashere committed Aug 12, 2023
1 parent 7bb1bc1 commit 6a11e69
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

/obj/item/gun/ballistic/automatic/pistol/ntusp
name = "NT-USP pistol"
desc = "The NT-HLIII, or NT-USP, is a small pistol that uses hardlight technology to synthesize bullets. Due to its low power, it doesn't have much use besides tiring out criminals."
desc = "The NT-HL3, later renamed to the NT-USP, is a small pistol that uses hardlight technology to synthesize bullets. Due to its low power, it doesn't have much use besides tiring out criminals."
icon_state = "ntusp"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/recharge/ntusp
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/energy/energy_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

/obj/item/gun/energy/e_gun/mini
name = "miniature energy gun"
desc = "A small, pistol-sized version of the energy gun with a built-in flashlight. It functions as a popular self defense weapon among the elite due to its small size and cheap price. It has two settings: disable and kill."
desc = "A small, pistol-sized version of the energy gun with a built-in flashlight. The NT-E2 functions as a popular self defense weapon among the elite due to its small size and cheap price. It has two settings: disable and kill."
icon_state = "mini"
item_state = "gun"
w_class = WEIGHT_CLASS_SMALL
Expand All @@ -43,7 +43,7 @@

/obj/item/gun/energy/e_gun/old
name = "prototype energy gun"
desc = "NT-E1 Prototype Energy Gun. Early stage development of a unique laser rifle that has multifaceted energy lens allowing the gun to alter the form of projectile it fires on command. Was quickly made useless by the MK-1 Hybrid Energy Gun, which utilized a more efficient power system."
desc = "NT-E1 Prototype Energy Gun. Early stage development of a unique laser rifle that has multifaceted energy lens allowing the gun to alter the form of projectile it fires on command. Was quickly made useless by the NT-E2 and NT-E3 Hybrid Energy Guns, which utilized a more efficient power system."
icon_state = "protolaser"
ammo_x_offset = 2
ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/electrode/old)
Expand Down
10 changes: 5 additions & 5 deletions code/modules/projectiles/guns/energy/laser.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/gun/energy/laser
name = "laser gun"
desc = "The NT-LIV is a basic energy-based laser gun that fires concentrated beams of light which pass through plasmaglass and thin metal."
desc = "The NT-L4 is a basic energy-based laser gun that fires concentrated beams of light which pass through plasmaglass and thin metal."
icon_state = "laser"
item_state = LASER
w_class = WEIGHT_CLASS_NORMAL
Expand All @@ -11,21 +11,21 @@

/obj/item/gun/energy/laser/practice
name = "practice laser gun"
desc = "A modified version of the NT-LIV laser gun, it fires less concentrated energy bolts designed for target practice."
desc = "A modified version of the NT-L4 laser gun, it fires less concentrated energy bolts designed for target practice."
ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
clumsy_check = 0
item_flags = NONE

/obj/item/gun/energy/laser/retro
name ="retro laser gun"
icon_state = "retro"
desc = "The NT-LI laser gun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
desc = "The NT-L1 laser gun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
ammo_x_offset = 3

/obj/item/gun/energy/laser/retro/old
name ="laser gun"
icon_state = "retro"
desc = "The NT-LI laser gun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws. This one in particular seems extremely worn out and barely functional. How long were you in cryo?"
desc = "The NT-L1 laser gun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws. This one in particular seems extremely worn out and barely functional. How long were you in cryo?"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/old)
ammo_x_offset = 3

Expand All @@ -39,7 +39,7 @@
name = "antique laser gun"
icon_state = "caplaser"
item_state = "caplaser"
desc = "The NT-S01 laser gun is NTs first attempt to provide an inbuilt recharger, and is the first in its line as an 'X' or experimental class weapon given to space station command members. Due to how expensive it is to produce, and that the material used to do so deteriorates quickly, it was decomissioned and the few models left are used as prizes meant to never see the light of day."
desc = "The NT-S01 laser gun is NTs first attempt to provide an inbuilt recharger, and is the first in its line as an 'S' or special class weapon given to space station command members. Due to how expensive it is to produce, and that the material used to do so deteriorates quickly, it was decommissioned, and the few models left are used as prizes meant to never see the light of day."
force = 10
ammo_x_offset = 3
selfcharge = 1
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/energy/special.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/gun/energy/ionrifle
name = "ion rifle"
desc = "Invented in 2506 to quell attacks from SELF aligned IPCs, the NT-I MK1 is a man-portable anti-armor weapon designed to disable mechanical threats at range."
desc = "Invented in 2506 to quell attacks from SELF aligned IPCs, the NT-I1 is a man-portable anti-armor weapon designed to disable mechanical threats at range."
icon_state = "ionrifle"
item_state = null //so the human update icon uses the icon_state instead.
can_flashlight = TRUE
Expand All @@ -17,7 +17,7 @@

/obj/item/gun/energy/ionrifle/carbine
name = "ion carbine"
desc = "The NT-I MKII Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
desc = "The NT-I2 Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
icon_state = "ioncarbine"
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BELT
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy/stun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

/obj/item/gun/energy/disabler
name = "disabler"
desc = "The NT-DII is a self-defense weapon that exhausts organic targets, weakening them until they collapse."
desc = "The NT-D2 is a self-defense weapon that exhausts organic targets, weakening them until they collapse."
icon_state = "disabler"
item_state = null
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
Expand Down

0 comments on commit 6a11e69

Please sign in to comment.