Commit Graph

26 Commits

Author SHA1 Message Date
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Unknown
cf39c61c2d Conflict Resolution
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Unknown
a4317b1910 [5654] Makes this PR Compile
This one made me cry.
2019-02-23 12:30:16 -05:00
Spades
a542e23e4e dragor no 2018-11-25 20:32:40 -05:00
pontifexminimus2
5913203c0f Due to request of Ace. 2018-11-25 17:22:35 +01:00
pontifexminimus2
4c46defd4f Renaming Protector too. 2018-11-25 16:50:24 +01:00
pontifexminimus2
784e48b895 Holy shit I hate this. 2018-11-25 16:45:37 +01:00
Verkister
03ab2fef08 Updates sickshot description.
Also making it little more clear that the only way to get victims out of uncooperative or dead things is no longer live human exclusive.
2018-04-16 10:48:25 +03:00
JOAN-RIG\Joan Risu
f5e2039dd5 removed invalid if statement from gunbuster. 2018-03-09 23:37:52 -08:00
JOAN-RIG\Joan Risu
b8708a6a0e removed a line from the gun saber 2018-03-02 23:53:15 -08:00
JOAN-RIG\Joan Risu
1420df0db1 Moves crescent rose to its own file, added a new gun for the nerd, and updated the Dominator to be alert level compliant. 2018-03-02 23:43:40 -08:00
Arokha Sieyes
f04c58f202 VS: Rewrites basically all of how bellies work
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
Leshana
fef30da831 Upgrades NSFW to use initialize() and SSoverlays
- Both as a first demonstration and as a practical bugfix, we upgrade the NSFW to use SSoverlay.   Instead of building a mutable_apperance and assigning it, we cut_overlays(), make our images, and call add_overlay() to queue it for compiling.
- We also must convert from using New() to initialize() becuase for annoying BYOND reasons,  some static variables in SSoverlays are not always instantiated before mapload.  So its important not to call overlays functions from New()  (We shouldn't be doing that ANYWAY for performance reasons, but now its even more true)
2018-02-24 18:33:53 -05:00
Arokha Sieyes
d68629fc80 VS: MA override removal changes 2018-02-24 11:44:57 -05:00
Arokha Sieyes
2dffd17c39 Fix #3010 2018-02-15 02:46:11 -06:00
Arokha Sieyes
5b1311c994 Fix NSFW and fluff item removal
Fixes the NSFW sprite buggyness.

Removes Briana's gun spawn. She gave her gun up ICly!
2018-02-03 21:58:41 -05:00
Leshana
ca880019e8 Refactor NSFW gun code to be robust against bad data conditions. 2018-01-08 22:43:57 -05:00
Arokha Sieyes
5c6637cffa Gives the HoS a KHI-102b NSFW
It's just my fluff gun. But sharing is caring.

From the ingame fluff:
"Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' 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."
"This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
"The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."

The HoS's includes 2 lethal, 2 stun, 1 net, and 1 ion battery. There are other batteries (like instagib!) but there's no way to get them normally. There's also one that strips people.
2018-01-04 23:57:11 -05:00
Cyantime
ad4f15e216 It's not a spawn class idiot 2017-10-01 14:47:47 -04:00
Cyantime
4046b90854 Limits bluespace harpoon teleportation range. 2017-10-01 14:38:44 -04:00
killer653
4fcbbe40f1 Size changes. 2017-07-28 06:43:44 -04:00
Arokha Sieyes
bd39011ab4 NSFW Gun
Also fixes slidey walls at centcom, gives the ERT commander a NSFW with stun, xray, lethal, and net. Gives deathsquad a full NSFW kit (including 'final option' ammo), replaces my own fluff Hunter with a NSFW with stun and net (so, same as the hunter, but that sprite is so badass I can't help it), and fixes a typo on my permit while I'm on there (KIN isn't a thing, KHI is).
2017-06-17 15:44:52 -04:00
Arokha Sieyes
6e5c63d3a5 Changes protector sprite, adds flashlight 2017-06-13 21:39:46 -04:00
Arokha Sieyes
557d685025 Individual-files some more complicated guns and ammo
We should probably do this from now on. Keeps things organized.
2017-06-13 15:07:19 -04:00
Arokha Sieyes
f98432a113 Adds 3 new guns
* KHI-98a 'Protector'
* MPA6 'Sickshot'
* PML9 'Pummeler'

The Protector is an energy gun that can't be fired on lethal on code green, so it's considered safe for sec to carry regularly, and has a slightly enhanced stun over tasers and normal eguns. It also features a DNA lock that allows one to secure the gun to themselves. An emag can disable both the security level lock and clear DNA.

The Sickshot is a stun weapon in handheld form, that induces nausea and vomiting. It has a chance to make predators vomit out prey (regardless of belly) and tends to cause confusion and nausea. It does cause slight burns from the hypersonic frequency sound it uses, but nothing serious or potentially lethal.

The Pummeler is a 'bass cannon' essentially that fires a huge sound wave, tossing the target away from you. It may or may not knock them down, depending on your luck, but it will definitely push them away, and potentially over a railing or wherever you wanted to put them.
2017-06-13 15:06:43 -04:00