Commit Graph

514 Commits

Author SHA1 Message Date
killer653
c97ded0da9 Adds in Icowom's custom items
Resolves #1695
2017-07-02 03:21:48 -04:00
Spades
87fa10e48e Merge pull request #1794 from Cyantime/koi
Improves koi
2017-07-02 02:29:57 -04:00
Spades
08704251b2 Merge pull request #1793 from VOREStation/guns
Dakka Dakka
2017-07-02 02:29:46 -04:00
Spades
7aa6ab1ff8 Merge pull request #1788 from Cyantime/transferrefactor
Splits some things into seperate procs
2017-07-02 02:20:39 -04:00
Cyantime
1a7e8a9878 koi upgrades 2017-07-01 15:07:07 -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
Cameron653
1a9546f8ab Merge pull request #1740 from Cameron653/master
Adds Rosey's fluffy tails
2017-06-29 19:09:34 -04:00
Cyantime
ba114dcf7a transfer&taste procs 2017-06-27 16:23:00 -04:00
Cyantime
a8e2cd5214 Enables %pred and %prey macros in full belly examine text 2017-06-23 11:47:01 -04:00
Spades
3bbc518978 Merge pull request #1752 from VOREStation/aro-nonlethals
KHI-102b "NSFW" Handgun
2017-06-20 01:21:12 -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
killer653
fd7020b8f5 Fixes suffocation when eaten
Credit to Shadow Larkens for fix
2017-06-16 15:17:43 -04:00
Arokha Sieyes
b1aeba9281 Persistent size between rounds
Allows your size to save at the end of each round. Get shrank'd or enbiggened? Now you can stay tiny between rounds if you like that consistency.

Don't want that? Just turn it off on the VORE tab. Accidentally left it on, and got saved? Just change your size to what you want in the character setup (and turn off saving it, too).
2017-06-16 09:41:34 -04:00
Arokha Sieyes
4419d5dc9c Merge pull request #1734 from VOREStation/chemsmoke-fix
Fixes objects using walk_to() not being able to be garbage collected.
2017-06-15 19:12:16 -04:00
Leshana
f60c024b2a Fixes objects using walk_to() not being able to be garbage collected.
* Okay evidently walk_to(A, B) doesn't stop when A reaches B, but keeps running in the background forever until it is manually canceled!  Therefore in order to be garbage collected, we must cancel walking on any object that might have initiated it.
* Fixes this on chemsmoke, spiders, and aiholos.
* The same story applies to walk_towards; fixed for dust, meteors and immovablerod, and also to walk_away; fixed for flashbangs.
* Also fixed chemsmoke actually getting qdeled at the right time.
2017-06-15 18:46:39 -04:00
Arokha Sieyes
7815c66ee2 Merge pull request #1731 from VOREStation/reagent-investigate
Fix the null reagents issue caused by recursive absorbtion.
2017-06-15 18:40:44 -04:00
killer653
568f62aa9b Adds fluffy tails
http://forum.vore-station.net/viewtopic.php?f=26&t=993
3 5 7 9
2017-06-15 15:54:22 -04:00
Arokha Sieyes
6e5c63d3a5 Changes protector sprite, adds flashlight 2017-06-13 21:39:46 -04:00
Leshana
cf37ea5728 Fix the null reagents issue caused by recursive absorbtion.
* When A absorbs B,  and then C absorbs A,  B's reagents are not updated, left in limbo.   They end up being hard-del'd and B has null reatents.
* This is fixed, but a least for now absorbing people will do a one time reagents mixing only, you can't share the same instances.
* Also fixed digestion gaining the pred half the prey's reagents too.
2017-06-13 19:58:57 -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
671b1c27dd Merge pull request #1718 from VOREStation/aro-absorbfix
Absorbing makes people invincible
2017-06-12 10:35:40 -04:00
Arokha Sieyes
425850f8c5 Absorbing makes people invincible
Fix, Part 2, Second Edition.

Funny, these have to be in the opposite order, becasue the type of bloodstr is the correct one and doesn't match reagents. Whoever thought of that is just the most amazing person.
2017-06-12 10:13:25 -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
0fb86b108f Merge pull request #1701 from VOREStation/aro-vorecleanup
Clean up last few verbs in Vore panel
2017-06-11 17:53:38 -04:00
Arokha Sieyes
ac8bd1c69d Clean up last few verbs in Vore panel
AI, and simple animals
2017-06-11 15:01:29 -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
Arokha Sieyes
869ae4dafd Fix prey becoming indigestible
And, really invincible. And runtimey. And uninjectible.
2017-06-10 22:09:27 -04:00
SpoopyLizz
e3db32fd60 hopefully fixed the problem this time 2017-06-11 02:51:29 +02:00
Arokha Sieyes
912b60a8b3 Merge pull request #1683 from VOREStation/aro-voretab
Remove 'Vore' tab, put verbs in IC and OOC
2017-06-10 19:21:13 -04:00
Arokha Sieyes
4744914204 Merge pull request #1681 from VOREStation/aro-bsjumpsuit
Fixes for Bluespace Jumpsuit
2017-06-10 19:21:07 -04:00
Arokha Sieyes
2d92c8c2fb Remove 'Vore' tab, put verbs in IC and OOC
OOC Escape goes to OOC obviously, Vore Panel is now the last thing in the IC tab.
2017-06-10 18:45:13 -04:00
Arokha Sieyes
118d035c4e Fixes for Bluespace Jumpsuit
Oddly sets your size to null, no idea where it happens, but have some safety checks.
2017-06-10 18:09:44 -04: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
bcb44367ba Merge pull request #1658 from VOREStation/aro-tport
Fix Bluespace Harpoon bug, Allow Teleport Jamming
2017-06-09 15:45:28 -04:00
Arokha Sieyes
a4208cc40c Merge pull request #1656 from VOREStation/aro-nifwatch
Don't let people skip NIF install time with cryo
2017-06-09 15:45:14 -04:00
Arokha Sieyes
39bc45b5e0 Merge pull request #1655 from VOREStation/aro-bsjs
Bluespace Jumpsuit and remove arbitrary size changing
2017-06-09 15:45:06 -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
Arokha Sieyes
cdfe97d9c7 Don't let people skip NIF install time with cryo
Tsk tsk.
2017-06-09 14:05:22 -04:00
Arokha Sieyes
952265036f Bluespace Jumpsuit and remove arbitrary size changing
The bluespace jumpsuit is relatively cheap (compared to a shrink ray) and craftable in R&D. When worn, it allows you to resize yourself at will, and when removed you'll snap back to your original size (use a shrinkray or the Mass Altering NIFSoft for permanent changes). The reason it's not permanent is because it's very cheap to make in R&D, really. No mining materials needed, but it only affects you. So you can consider it the 'minor' size change tool.

This PR also comments out the arbitrary size change verb since we decided to remove it, as it was being used to generally just make 'magic' characters that could resize themselves at will, or use it for mechanical purposes to avoid being shot etc when fighting starts, even though it says specifically not to do these things. If you want such a character that can resize themselves due to their physiology, please apply for an SCA and we can give you a small fluff item or other accomidation to allow such a thing.
2017-06-09 11:51:29 -04:00
Arokha Sieyes
2f3b56467c Minor NIF and Soulcatcher Tweaks
- Brainmob can understand galcom so they can understand radio announcements if they're allowed to hear things.
- Adds admin verb in Fun tab for "Quick NIF" to quickly implant someone with a NIF, if for example they lost theirs via bug, or for antags in events.
- Some tweaks in Persist VR to not 'hard crash' just in case runtiming prevents other things.
- Added titles to top of *nsay and *nme boxes so you can remember what you're doing.
2017-06-09 10:16:45 -04:00
Arokha Sieyes
0f251a88ff Merge pull request #1648 from Yoshax/tailsandcolors
Fixes some colourisation issues
2017-06-09 02:43:07 -04:00