Commit Graph

2511 Commits

Author SHA1 Message Date
Leshana ca880019e8 Refactor NSFW gun code to be robust against bad data conditions. 2018-01-08 22:43:57 -05:00
Arokha Sieyes a172221502 Merge pull request #2693 from blazerules/master
Electrostaff sheath fix
2018-01-07 21:35:13 -05:00
blazerules 846bb26f28 Electrostaff sheath fix
Added new held item sprites.
2018-01-07 18:44:50 +02:00
Mewchild a3d9ea5659 Bone Signet Ring 2018-01-06 16:51:06 -06:00
blazerules b8f77619f2 Electrostaff sheath fix
For some reason changing it to box/fluff broke it. Can't... put my finger on why. But it works as a backpack so alls good.
2018-01-06 13:03:31 +02:00
Arokha Sieyes 950cea6c34 Merge pull request #2689 from VOREStation/aro-sizegunqol
Sizegun QoL/Nerf
2018-01-05 21:36:06 -05:00
Arokha Sieyes 82a9a3c89e Sizegun verb change 2018-01-05 20:56:07 -05:00
Arokha Sieyes 1183e5fa80 Sizegun QoL/nerf
I want clicking it in-hand to let me change the size (so I can do it with Z). And I want the box to show the currently set size when I'm changing it instead of always just showing 200. So that's what it does now.
Also jeez. If we have the technology to make a military-grade battery recharge in just a few seconds, why don't we use it other places? Makes the thing not self-recharge. Just stuff it in a recharger. There are plenty.
Added various rechargers everywhere in public places on the map, since there weren't enough, just to be sure.
2018-01-05 17:16:23 -05:00
Leshana f50d5153ff Merge pull request #2681 from VOREStation/aro-nsfwhos
Gives the HoS a KHI-102b NSFW
2018-01-05 14:21:59 -05:00
Arokha Sieyes 7bd32b056d Merge pull request #2676 from Screemonster/bellybugs
Fixes some bugs relating to absorption and struggling, makes struggle feedback messages clearer
2018-01-05 10:10:46 -05:00
Arokha Sieyes 5a81cbefba Merge pull request #2671 from blazerules/master
Electrostaff Custom Item
2018-01-05 10:08:32 -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
Screemonster 9f15ee88a0 Adds vore panel preference to enable/disable being eaten by mobs 2018-01-05 02:53:13 +00:00
Screemonster 3090acdceb does the absorb-release-thing more betterer 2018-01-05 01:08:22 +00:00
Screemonster a0b02b57c1 fixes some bugs in absorption and struggling 2018-01-04 23:49:06 +00:00
blazerules 77080534a6 Electrostaff Custom Item
Please kill me I am bad at noticing small things.
2018-01-03 11:08:25 +02:00
blazerules 43108a5dab Electrostaff Custom Item
Fixed typos
2018-01-03 10:57:31 +02:00
blazerules 07b0b071ce Electrostaff Custom Item
Changes as asked for by Arokha
2018-01-03 10:07:52 +02:00
blazerules 2d434c40d5 Electrostaff Custom Item
This is the code for the stunstaff as was approved here

https://forum.vore-station.net/viewtopic.php?f=27&t=1204
2018-01-03 09:28:43 +02:00
Arokha Sieyes 2bcee3d20a Merge pull request #2666 from Verkister/OwO
Makes belly bulge examine add up prey sizes.
2018-01-02 16:23:26 -05:00
Verkister 022e3cf63b Update belly_vr.dm 2018-01-02 23:08:27 +02:00
Verkister 899d7c0b2b Makes belly bulge examine add up prey sizes.
-If prey 1 is too small to show up, ya get no visible bulge.
-But if you eat another prey also too small to show up, but take enough space together with the first one, ya get bulge.
-Also if you eat a small person, and then a big person, ya now get bulge too. (unlike before)

OwO
2018-01-02 19:03:47 +02:00
Verkister 11a8ea16ef Fixes bugs related to picking shit from empty belly content lists.
-Makes digestion modes "finish" once everything unprotected is gone.
-This also means your guts will no longer permagurgle fruitlessly while nothing but a shitty ID in there.
2018-01-02 18:27:44 +02:00
Cameron653 d6be1e9b53 Merge pull request #2587 from Cameron653/FLUFF_ITEMS
Birb fluff items
2017-12-27 17:12:45 -05:00
Arokha Sieyes 08ea0ccfd5 Fix two fluff IDs
Path changed and this ID split into two in the backend.
2017-12-26 19:44:35 -05:00
Cyantime 29a2219fde Cleans up custom_items_vr.dm 2017-12-20 22:23:42 -05:00
Cyantime d64dc8cf6a Cleans up custom_clothes_vr.dm 2017-12-20 22:23:29 -05:00
Spades 54b5d74ada Revert "Chirret species" 2017-12-19 19:47:50 -05:00
killer653 8c29c2f68d Birb fluff items 2017-12-19 16:05:35 -05:00
killer653 55c8c8a6fb Merge remote-tracking branch 'refs/remotes/VOREStation/master'
# Conflicts:
#	icons/mob/human_races/markings_vr.dmi
2017-12-17 04:06:35 -05:00
Spades 2a79f2f044 Merge pull request #2572 from Cameron653/EGGS
Custom Egg Implant
2017-12-16 08:30:43 -05:00
killer653 7f70702f58 WIP. 2017-12-14 22:54:01 -05:00
killer653 5736f590c9 Gives a player an egg implant. 2017-12-13 20:22:02 -05:00
killer653 285ad76b5b Custom Imp 2017-12-07 14:24:46 -05:00
Cameron653 435bd21044 Update resize_vr.dm 2017-11-27 20:33:27 -05:00
Spades 05bef4814b Merge pull request #2513 from Verkister/flops
Adds some fresh loadout items.
2017-11-25 23:48:43 -05:00
Verkister eee14daa4d Fixes a hefty fuckup that slipped into the HV organ update.
-Yeah I somehow had forgot the content removal and nobody had even noticed it lmao???
-Basically infinite flab on ya because the organs weren't getting removed from the contents list and thus reapplying their nutriment over and over again every tick :v
2017-11-23 20:50:31 +02:00
Verkister dcdeba60ae adds gn set 2017-11-22 23:53:59 +02:00
Verkister d699b23e9f Adds yet another new loadout accessory.
-Drop straps. Basically dropped suspenders or drop pouches without the pouches.
-Basically I've been really digging the aesthetic thiccness of the drop pouches and just wanted the look available without the access walls and color restrictions.
-Yeah it's colorable too.
2017-11-22 22:56:38 +02:00
Spades 9c3578e6fe Merge pull request #2495 from Cameron653/BYOND_IS_A_VERY_GOOD_GAME_ENGINE_THAT_IS_HIGHLY_ADVANCED_AND_ANYONE_WHO_DARES_TO_MOCK_OR_OTHERWISE_DISGRACE_ITS_NAME_WILL_BE_PUNISHED
Adds Slime Feeding
2017-11-20 19:07:13 -05:00
Cameron653 bd8d2bbf00 Gives Tas coat same allowed items as HoS oat 2017-11-20 16:04:59 -05:00
Cameron653 1de5a6c132 Update vorepanel_vr.dm 2017-11-19 11:25:34 -05:00
Cameron653 00ab8f752b Also fixes Ivy's fluff ID 2017-11-18 00:16:12 -05:00
killer653 757a5ca49b Slime Force Feeding 2017-11-18 00:13:03 -05:00
Cameron653 5c4aac8ca7 Adds egg description 2017-11-17 21:01:46 -05:00
Spades d80abeb939 Merge pull request #2475 from VOREStation/luger-nerf
Rebalanced the Energy Luger
2017-11-16 22:35:39 -05:00
Spades 0dbc5f92f9 Merge pull request #2490 from VOREStation/aro-deadgrab
Stops runtime when ghosts examine people
2017-11-16 22:35:01 -05:00
Arokha Sieyes 52e6096be6 Stops runtime when ghosts examine people
Defines this proc so that it will work on every mob, then overrides it on living to work like normal. I'd use INFINITE but I have no idea what would happen if it tried to do math on it.
2017-11-16 15:24:18 -05:00
Verkister 7c7794f74f Unrestricts my fluff goggles for general loadout use.
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
2017-11-16 09:31:27 +02:00
Spades 121f626d10 Tweaked the description
Makes it more unique.
2017-11-14 02:21:46 -05:00