From 784e48b8954a8facd5d91d10d5e4dad716532ab4 Mon Sep 17 00:00:00 2001 From: pontifexminimus2 Date: Sun, 25 Nov 2018 16:45:37 +0100 Subject: [PATCH 1/4] Holy shit I hate this. --- code/modules/projectiles/guns/energy/netgun_vr.dm | 4 ++-- code/modules/vore/fluffstuff/guns/dominator.dm | 4 ++-- code/modules/vore/fluffstuff/guns/gunsword.dm | 4 ++-- code/modules/vore/fluffstuff/guns/nsfw.dm | 4 ++-- code/modules/vore/fluffstuff/guns/pummeler.dm | 4 ++-- code/modules/vore/fluffstuff/guns/sickshot.dm | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/modules/projectiles/guns/energy/netgun_vr.dm b/code/modules/projectiles/guns/energy/netgun_vr.dm index 8678d2c5dc..3e82aef282 100644 --- a/code/modules/projectiles/guns/energy/netgun_vr.dm +++ b/code/modules/projectiles/guns/energy/netgun_vr.dm @@ -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" diff --git a/code/modules/vore/fluffstuff/guns/dominator.dm b/code/modules/vore/fluffstuff/guns/dominator.dm index 25ca2610f3..657ba95738 100644 --- a/code/modules/vore/fluffstuff/guns/dominator.dm +++ b/code/modules/vore/fluffstuff/guns/dominator.dm @@ -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" diff --git a/code/modules/vore/fluffstuff/guns/gunsword.dm b/code/modules/vore/fluffstuff/guns/gunsword.dm index 63be249006..dd0eb37472 100644 --- a/code/modules/vore/fluffstuff/guns/gunsword.dm +++ b/code/modules/vore/fluffstuff/guns/gunsword.dm @@ -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." + name = "top-loaded energy 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" diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm index bc570697d6..8340971e03 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -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 = "sleek energy pistol" + 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." diff --git a/code/modules/vore/fluffstuff/guns/pummeler.dm b/code/modules/vore/fluffstuff/guns/pummeler.dm index b12ce223e8..f3d6c546ee 100644 --- a/code/modules/vore/fluffstuff/guns/pummeler.dm +++ b/code/modules/vore/fluffstuff/guns/pummeler.dm @@ -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." diff --git a/code/modules/vore/fluffstuff/guns/sickshot.dm b/code/modules/vore/fluffstuff/guns/sickshot.dm index ea0820a908..e44595ddf0 100644 --- a/code/modules/vore/fluffstuff/guns/sickshot.dm +++ b/code/modules/vore/fluffstuff/guns/sickshot.dm @@ -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 = "energy 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." @@ -44,7 +44,7 @@ var/mob/living/carbon/human/H = target H.vomit() H.Confuse(2) - + return 1 //R&D Design From 4c46defd4f23a1ec84efe5b9ab9fc29b10d888ae Mon Sep 17 00:00:00 2001 From: pontifexminimus2 Date: Sun, 25 Nov 2018 16:50:24 +0100 Subject: [PATCH 2/4] Renaming Protector too. --- code/modules/vore/fluffstuff/guns/protector.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/fluffstuff/guns/protector.dm b/code/modules/vore/fluffstuff/guns/protector.dm index 173c00b637..b1b39e6f2d 100644 --- a/code/modules/vore/fluffstuff/guns/protector.dm +++ b/code/modules/vore/fluffstuff/guns/protector.dm @@ -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." From 5913203c0fd4af08189d0dc1beef152cdc5484b9 Mon Sep 17 00:00:00 2001 From: pontifexminimus2 Date: Sun, 25 Nov 2018 17:22:35 +0100 Subject: [PATCH 3/4] Due to request of Ace. --- code/modules/vore/fluffstuff/guns/gunsword.dm | 2 +- code/modules/vore/fluffstuff/guns/nsfw.dm | 2 +- code/modules/vore/fluffstuff/guns/sickshot.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vore/fluffstuff/guns/gunsword.dm b/code/modules/vore/fluffstuff/guns/gunsword.dm index dd0eb37472..f6bb1a3026 100644 --- a/code/modules/vore/fluffstuff/guns/gunsword.dm +++ b/code/modules/vore/fluffstuff/guns/gunsword.dm @@ -1,5 +1,5 @@ /obj/item/weapon/gun/energy/gun/fluff/gunsword - name = "top-loaded energy pistol" + name = "Sword Buster" 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' diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm index 8340971e03..a0c7d89196 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -1,6 +1,6 @@ // -------------- NSFW ------------- /obj/item/weapon/gun/projectile/nsfw - name = "sleek energy pistol" + 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." diff --git a/code/modules/vore/fluffstuff/guns/sickshot.dm b/code/modules/vore/fluffstuff/guns/sickshot.dm index e44595ddf0..0cea7e500b 100644 --- a/code/modules/vore/fluffstuff/guns/sickshot.dm +++ b/code/modules/vore/fluffstuff/guns/sickshot.dm @@ -1,6 +1,6 @@ // -------------- Sickshot ------------- /obj/item/weapon/gun/energy/sickshot - name = "energy revolver" + name = "empukening 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." From a542e23e4e81778c2012fd5fd8bc14326b5efe40 Mon Sep 17 00:00:00 2001 From: Spades Date: Sun, 25 Nov 2018 20:32:40 -0500 Subject: [PATCH 4/4] dragor no --- code/modules/vore/fluffstuff/guns/sickshot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/guns/sickshot.dm b/code/modules/vore/fluffstuff/guns/sickshot.dm index 0cea7e500b..6afda74a9c 100644 --- a/code/modules/vore/fluffstuff/guns/sickshot.dm +++ b/code/modules/vore/fluffstuff/guns/sickshot.dm @@ -1,6 +1,6 @@ // -------------- Sickshot ------------- /obj/item/weapon/gun/energy/sickshot - name = "empukening revolver" + 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."