cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4515 from pontifexminimus2/dragor-HEYLOOKTHISMORONFORGOTHOWTODOSOURCETREEIBLAMEYOUARONAIFORMAKINGMEJUMPTHROUGHTHESEHOOPS

Browse Source 
Renames guns with proper names for a more generic name and edits their desc.
This commit is contained in:
Spades
2018-12-04 20:22:02 -05:00
committed by GitHub
parent 14cc6f8440 a542e23e4e
commit 4a27ffb35a
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/energy/netgun_vr.dm
View File

@@ -1,6 +1,6 @@
/obj/item/weapon/gun/energy/netgun
name = "\improper KHI \"Hunter\" capture gun"
desc = "A Kitsuhana-designed 'non-lethal capture device' stunner and energy net launcher, \
name = "energy net gun"
desc = "A Kitsuhana-designed, usually dubbed 'Hunter' or 'non-lethal capture device' stunner and energy net launcher, \
for when you want criminals to stop acting like they're on a 20th century British comedy sketch show."
icon = 'icons/obj/gun_vr.dmi'
icon_state = "hunter"

4
code/modules/vore/fluffstuff/guns/dominator.dm
View File

@@ -1,7 +1,7 @@
// -------------- Dominator -------------
/obj/item/weapon/gun/energy/gun/fluff/dominator
name = "\improper MWPSB Dominator"
desc = "A MWPSB's Dominator from the Federation. Like the basic Energy Gun, this gun has two settings. It is used by the United Federation Public Safety Bureau's Criminal Investigation Division. The weapon can only be fired by the owner and is alert-level locked."
name = "bulky energy gun"
desc = "A MWPSB Dominator from the Federation. Like the basic Energy Gun, this gun has two settings. It is used by the United Federation Public Safety Bureau's Criminal Investigation Division. The weapon can only be fired by the owner and is alert-level locked."
icon = 'icons/vore/custom_guns_vr.dmi'
icon_state = "dominatorstun100"

2
code/modules/vore/fluffstuff/guns/gunsword.dm
View File

@@ -1,6 +1,6 @@
/obj/item/weapon/gun/energy/gun/fluff/gunsword
name = "Sword Buster"
desc = "A gun custom built using the science behind a Golden Empire pistol."
desc = "The Sword Buster gun is custom built using the science behind a Golden Empire pistol. The cell can be removed in close range and used as energy shortsword."
icon = 'icons/vore/custom_guns_vr.dmi'
icon_state = "gbuster100"

4
code/modules/vore/fluffstuff/guns/nsfw.dm
View File

@@ -1,7 +1,7 @@
// -------------- NSFW -------------
/obj/item/weapon/gun/projectile/nsfw
name = "KHI-102b \'NSFW\'"
desc = "Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven \
name = "cell-loaded revolver"
desc = "Variety is the spice of life! The KHI-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \
energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of \
energy beams can be configured at once. Ammo not included."

4
code/modules/vore/fluffstuff/guns/protector.dm
View File

@@ -1,7 +1,7 @@
// -------------- Protector -------------
/obj/item/weapon/gun/energy/protector
name = "\improper KHI-98a \'Protector\'"
desc = "The KHI-98a is the first firearm custom-designed for Nanotrasen by KHI. It features a powerful stun mode, and \
name = "small energy gun"
desc = "The KHI-98a 'Protector' is the first firearm custom-designed for Nanotrasen by KHI. It features a powerful stun mode, and \
an alert-level-locked lethal mode, only usable on code blue and higher. It also features an integrated flashlight!"
description_info = "This gun can only be fired in lethal mode while on higher security alert levels. It is legal for sec to carry for this reason, since it cannot be used for lethal force until SOP allows it, in essence."

4
code/modules/vore/fluffstuff/guns/pummeler.dm
View File

@@ -1,7 +1,7 @@
// -------------- Pummeler -------------
/obj/item/weapon/gun/energy/pummeler
name = "\improper PML9 \'Pummeler\'"
desc = "For when you want to get that pesky marketing guy out of your face ASAP. The pummeler fires one HUGE \
name = "hypersonic gun"
desc = "For when you want to get that pesky marketing guy out of your face ASAP. The PML9 'Pummeler' fires one HUGE \
sonic blast in the direction of fire, throwing the target away from you at high speed. Now you can REALLY \
turn up the bass to max."

4
code/modules/vore/fluffstuff/guns/sickshot.dm
View File

@@ -1,7 +1,7 @@
// -------------- Sickshot -------------
/obj/item/weapon/gun/energy/sickshot
name = "\improper MPA6 \'Sickshot\'"
desc = "Need to stun someone? Don't mind having to clean up the mess afterwards? The Sickshot is the answer to your prayers. \
name = "\'Sickshot\' revolver"
desc = "Need to stun someone? Don't mind having to clean up the mess afterwards? The MPA6 'Sickshot' is the answer to your prayers. \
Using a short-range concentrated blast of disruptive sound, the Sickshot will nauseate and confuse the target for several seconds. NOTE: Not suitable \
for use in vacuum. Usage on animals may cause panic and rage without stunning. May cause contraction and release of various 'things' from various 'orifices', even if the target is already dead."