Commit Graph

880 Commits

Author SHA1 Message Date
Cyantime
84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Leshana
436d48b337 Update VOREStation specific code to use merged in features.
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
2018-01-19 18:15:47 -05:00
Cyantime
09eb4054a5 Removes hypospray/vr and vial/vr 2018-01-18 19:01:26 -05:00
Arokha Sieyes
da3358a729 Merge pull request #2791 from VOREStation/aro-knifepath
Knife path fix for VS trashpiles and a fluff item
2018-01-18 18:20:47 -05:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Arokha Sieyes
00b69ca913 Clean up persist messages in server log
Some of them look like errors or incomplete when they aren't
2018-01-18 15:35:31 -05:00
Leshana
9456969a8e Make the persistence of spawn-points at end of be configurable per map.
* Added three vars to the map datum to confgure which spawn point should be persisted for players who are dead, evac'd or stayed on station.
2018-01-17 00:31:04 -05:00
Arokha Sieyes
ce46a0a14b Merge pull request #2759 from VOREStation/aro-ghostbusting
Prevent certain things from including spooky ghosts
2018-01-16 13:53:26 -05:00
Arokha Sieyes
10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
Arokha Sieyes
f2b83eb7da Prevent certain things from including spooky ghosts
I mean I like soulvore but c'mon.
2018-01-15 20:38:28 -05:00
Arokha Sieyes
60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork
Plaaaaaaanessssssss
2018-01-14 13:08:35 -05:00
Arokha Sieyes
8f71a052a4 VS: Planes shenanigans. Begins 'plane' work, for VS specific things. 2018-01-14 00:40:00 -05:00
Arokha Sieyes
8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon
Refactor Digestion
2018-01-14 00:07:54 -05:00
Arokha Sieyes
ec7ebd1650 Merge pull request #2714 from Verkister/forbiddentaurs
Enables 2 compatibility lacking fluff taur types.
2018-01-13 23:41:34 -05:00
Verkister
d3485c8e74 makes drake and otie taurs dual colorable 2018-01-12 09:58:50 +02:00
Isaac Erwin
890663f2e0 Renames leg cuffs to leg wraps, renames the gold ones
Mainly to fix the inconsistent capitalization, partially to make it consistent with the names in the loadout, partially because I think they're too long to be considered a cuff.

I'd also change the pathing so that the cuffs aren't a subtype of black shoes for no apparent reason, but I'd rather not accidentally break anything.

I'm also going to take this opportunity to say that I want an all-black/grey variant of these.
2018-01-11 07:36:37 -05:00
Arokha Sieyes
072a40dea3 Make digest_act even more generic (and contaminate)
Now returns nutrition that should be gained, and accepts an internal_contents list and where you want subobjects placed
2018-01-10 10:02:13 -05:00
Arokha Sieyes
449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Verkister
20bfadd159 Enables 2 compatibility lacking fluff taur types.
-The earlier drake and otie out of request.
-No gear compatibility for these yet.
2018-01-09 13:36:14 +02:00
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