Commit Graph

257 Commits

Author SHA1 Message Date
Spades
e173da0603 Merge pull request #1902 from DarkWolfInsanity/IvyIDFix
Ivy Baladeva ID Fix
2017-07-26 20:11:24 -04:00
Cinder
57efcfe8dc Ivy ID Fix
Forgot the bag. oops
2017-07-25 10:21:25 -05:00
killer653
153641cabe Fixes conflict
Fixes conflict
2017-07-25 08:58:36 -04:00
Cinder
5e6a8fb4a0 Fixes Ivy Baladeva's ID issues
Instead of making a new ID that doesn't get her access rights, make a reprinter instead that just changes the icon and description
2017-07-25 00:04:24 -05:00
Cameron653
a5d54f1bac Removes whitespace. 2017-07-23 19:11:56 -04:00
killer653
3a5da61430 Adds Roiz's custom coat 2017-07-23 16:23:32 -04:00
Cameron653
a516a0d041 Adds L and R hand sprites 2017-07-23 10:47:26 -04:00
killer653
016337ee4d Quick, small fix. 2017-07-21 04:02:49 -04:00
killer653
8fbf7fc176 Adds Natje's fluff items 2017-07-21 03:02:52 -04:00
Spades
a04bca6da9 Merge pull request #1863 from Ketrai/patch-1
Add approved fluff item: pink bear hat.
2017-07-19 12:26:48 -04:00
Ketrai
55402f1c73 Update custom_clothes_vr.dm 2017-07-18 20:53:51 +02:00
Ketrai
ac9440956b Add approved fluff item: pink bear hat.
link to approved form : https://forum.vore-station.net/viewtopic.php?f=26&t=956

First time I'm adding fluff, no idea if this is how I'm supposed to do it, just tried to follow the instructions.
2017-07-15 19:43:40 +02:00
Cameron653
b7608f81e8 Fixes code up. 2017-07-13 17:12:46 -04:00
killer653
c736b6f824 Everything works except for the loadout spawn
Work on later.
2017-07-13 10:15:26 -04:00
Spades
a349e389c2 Update custom_clothes_vr.dm 2017-07-12 13:06:39 -04:00
kcin2001
97a5269bfd Update custom_clothes_vr.dm 2017-07-12 02:04:27 -07:00
Spades
6434fa862d Update custom_clothes_vr.dm 2017-07-10 22:58:15 -04:00
kcin2001
612b5b94c3 minor changes as requested 2017-07-10 18:56:28 -07:00
kcin2001
e706cd80f0 adds a description to the undercoat 2017-07-09 22:18:01 -07:00
kcin2001
2b6e33df2e new tesh items - code edition 2017-07-09 21:58:04 -07:00
killer653
c4a2caba2e Duplicate of #1799 2017-07-05 12:07:21 -04:00
Spades
3db35eb684 Dakka Dakka
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -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
Arokha Sieyes
599474a062 Makes people's fluff IDs get account numbers
Takes it from the user's mindddd.
2017-06-12 10:07:18 -04:00
Arokha Sieyes
da78624bc1 Merge pull request #1667 from SpoopyLizz/master
Added colored eggs and did some minor tweaks.
2017-06-11 14:40:31 -04:00
Arokha Sieyes
93888221b2 Merge pull request #1690 from VOREStation/polaris-sync-gc
tg Garbage Subsystem
2017-06-11 14:39:30 -04:00
InterroLouis
8cefd8f702 Update custom_guns_vr.dm 2017-06-11 11:45:00 -04:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
2017-06-10 22:44:03 -04:00
SpoopyLizz
e3db32fd60 hopefully fixed the problem this time 2017-06-11 02:51:29 +02:00
Yoshax
73fda854cf Add's Epic_Charger's custom taur winter snow suit 2017-06-10 18:18:20 +01:00
SpoopyLizz
ac03b1075d Added colored eggs and did some minor tweaks. 2017-06-10 03:34:55 +02:00
Arokha Sieyes
4c3993df65 Merge pull request #1665 from VOREStation/aro-bshtweaks
Couple more BSH Tweaks
2017-06-09 20:06:11 -04:00
Arokha Sieyes
f88ac10362 Couple more BSH Tweaks
No more harpooning into walls to walk into areas you can't see because that's stupid. You can't harpoon turfs with dense objects on them.
2017-06-09 19:52:18 -04:00
Arokha Sieyes
a22e9e70aa Remove a bunch of my fluff items
We're going to start limiting them to certain jobs and such. Too many people have too many mechanically superior-to-normal-stuff fluff items. So let this be an example that it's not some sorta thing we're doing to be mean.
2017-06-09 19:41:13 -04:00
Arokha Sieyes
4344c285a6 Merge pull request #1654 from Verkister/master
Longpup mobs! (plus an approved fluff item committed earlier)
2017-06-09 19:31:50 -04:00
Arokha Sieyes
78594376f1 Fix Bluespace Harpoon bug, Allow Teleport Jamming
The subspace jammers will jam portable teleporters (not the hand tele, for ~reasons~ (mostly to give it one good feature)). This should also fix an annoying bug where the bluespace harpoon fails to work for a long period of time.
2017-06-09 15:32:25 -04:00
Yoshax
f154683662 Removes the snowflake human defined verbs from the majority of the reagent implants 2017-06-08 21:52:56 +01:00
Verkister
797664ff1f Merge branch 'master' of https://github.com/Verkister/VOREStation 2017-06-07 12:12:16 +03:00
Cameron653
5b9d37ffec Fluff item - Ruda Lizden (Hisstective's Badge) (#1632)
* Adds Roiz's items

* Adds Item
2017-06-06 21:57:51 -04:00
Arokha Sieyes
379e1ad12d Roiz Egg Tweak
Stahp giving me compile warnings
2017-06-06 20:18:57 -04:00
Arokha Sieyes
33e7de6295 Merge pull request #1614 from SpoopyLizz/master
Egg laying implant, yo!
2017-06-06 09:38:52 -04:00
Verkister
53069d1dcb Adds fluff science goggles that actually do nothing. 2017-06-06 12:38:32 +03:00
SpoopyLizz
13c431a849 Changes as requested by Aronai fulfilled.
https://github.com/VOREStation/VOREStation/pull/1614
2017-06-05 00:47:50 +02:00
Arokha Sieyes
1623f5fd21 Modify fluff gun to 10mm
Instead of mateba megarounds.
2017-06-04 12:46:12 -04:00
SpoopyLizz
fc1bffdfb6 Egg laying implant, yo! 2017-06-03 15:59:45 +02:00
Leshana
c4bdc4c027 Updated VOREStation specific files for the ammo path reorganization.
* Updated paths in dm files
* Updated references in all dmm files for tether, virgo, and randomz
2017-06-02 12:18:13 -04:00
Arokha Sieyes
4913464913 A Jacket To Match The Coat
And normal holster instead of leg holster. Because I can never decide what I want.
2017-05-30 15:50:23 -04:00