Commit Graph

1634 Commits

Author SHA1 Message Date
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
Novacat
b91b10aaa5 Merge pull request #4642 from TheFurryFeline/patch-2
Boost Belly Limit
2019-03-27 11:22:30 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Heroman3003
ca16b830b1 Added ID restoration terminal near HoP's office 2019-03-20 10:41:36 +10:00
Heroman
f6d9a42c57 Fixes misterming of contamination flavor 2019-03-19 15:55:40 +10:00
Heroman
86f0cb2919 Added ability to toggle and configure contamination and item digestion 2019-03-19 14:46:07 +10:00
Unknown
66c35a6d6d More Fixes 2019-03-03 07:28:28 -05:00
Unknown
856b320091 Fixes Newspapers 2019-03-02 20:52:07 -05:00
Spades
41bcb6a729 Merge pull request #4805 from Sebbe9123/master
Changes vore egg_types to not interfere with mob egg_types.
2019-03-02 08:03:58 -05:00
Spades
629eebd803 Merge pull request #4555 from VOREStation/upstream-merge-5654
[MIRROR] Makes math helpers defines for performance
2019-03-02 07:57:57 -05:00
Unknown
fe43d06351 Fixes Mob Vore 2019-03-01 22:03:44 -05:00
Unknown
690ecfdbdf Fixes Digestion Toggle
...Not sure why this was disabled, it is an easy fix.
2019-03-01 19:35:36 -05:00
TheFurryFeline
02ef9c29ed Typo fix 2019-03-01 15:05:47 -05:00
TheFurryFeline
eaf41744e1 Typo fix 2019-03-01 15:05:18 -05:00
TheFurryFeline
997fe12dc7 Minor Change
Phi Ahkeen -> Phi Viesti
2019-03-01 14:16:47 -05:00
TheFurryFeline
e167b25f4c Add Resh's HOS Coat
So, I saw a thing on forums here, https://forum.vore-station.net/viewtopic.php?f=26&t=1519 and thought, 'hey, I can fix that.' So, here we are. :> Also adjusts Phi's last name - in the comment for the listing - as I've seen it in-game, back to Viesti.
2019-03-01 14:00:58 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Wickedtemp
7e4fb1e511 Bumped nutrition cost from 6 to 4.
Kept messing with it, decided that this would make it a bit better.
2019-03-01 00:05:15 -06:00
Sebbe9123
628ae84c15 Changes eggtype to not mess with simple_mobs 2019-02-25 11:58:14 +01:00
Sebbe9123
f1e9a1c7b8 Changes vore eggtype to not mess with simple_mobs 2019-02-25 11:57:27 +01:00
Unknown
a4317b1910 [5654] Makes this PR Compile
This one made me cry.
2019-02-23 12:30:16 -05:00
Spades
b7c90be1b0 Extended the expiration time 2019-02-23 11:49:19 -05:00
Heroman3003
0171fa3faa Cleanup of Tempest saddlebag code 2019-02-23 06:37:57 +10:00
Unknown
de18c9321f Fixes Spirit for AI Overhaul
- Also fixes an error with Phi's ring
2019-02-20 12:26:58 -05:00
Heroman3003
b1c142eff0 Makes mlembulance slightly less quiet 2019-02-20 07:37:43 +10:00
Sharkmare
c28689a616 minor spelling fix 2019-02-12 08:58:02 +01:00
TheFurryFeline
7d3f5b8627 Vakashi's Permit
Adds Vakashi's permit as per https://forum.vore-station.net/viewtopic.php?f=27&t=1447
2019-02-08 19:46:39 -05:00
Heroman3003
239a222a7f Improved Tempest ambulance sprites to better represent ambulance. 2019-02-05 06:25:31 +10:00
Heroman3003
f88452d2c9 Tempest's saddlebags now double as ambulance siren 2019-02-04 17:58:16 +10:00
Poojawa
f05675e269 Resolves compile errors 2019-02-02 04:33:13 -06:00
Silver
fcc1bf5b06 Adds Koyo's Fluff Item Box
Adds Koyo's Fluff Item Box, approved at https://forum.vore-station.net/viewtopic.php?f=27&t=1502
2019-02-01 21:39:18 -06:00
Wickedtemp
56012d17fa Improves Healbelly
https://github.com/VOREStation/VOREStation/issues/4611

I've no idea how to actually add wound bandaging and disinfecting onto this, so while it was mentioned in the initial issue, it wasn't added. If someone more experienced than me wants to do it, go for it. 

After a little bit of messing around, I figured these values would be decent. It's rather close to tricordrazine. 

- Brute Heal, lowered from 5 to 2.5 per cycle, now healing at roughly 0.4 per tick. Compare with Tricord's 0.3 per tick.
- Burn Heal, lowered from 5 to 2.5 per cycle, now healing at roughly 0.4 per tick. Compare with Tricord's 0.3 per tick.
- Toxin Heal added at 5 per cycle, 0.8 per tick. More than Brute/Burn as this damage type is often expected to increase, allowing for stabilization of infections as long as it isn't progressed to L3. Also because 5 was the default value for the other damage types, and it works out nicely now being a clean double of the new 2.5 value for those types, additionally acting as a decent compensation for not being able to clear or prevent infections. Might as well be able to combat them before they go L3.
- Oxy Heal added at 5 per cycle, 0.8 per tick. Compared with Tricord's 0.6 heal per tick. This would be enough to prevent oxy in crit and help stabilize a ruptured lung. Plus, keeping with 5's and divisions of 5 because it pleases me.
- Genetic Heal, added at 1.25 per cycle, roughly 0.2 per tick. An un-upgraded resleever will produce a body with 80 genetic damage, providing default health. At this rate, it would take roughly 6-7 minutes to heal completely. Does *not* remove disabilities. Might allow it to, if it turns out all I have to do is add 'disabilities = 0'. It's nearly 5am and I'm too tired to do any more testing.
- Bumped nutrition cost from 2 to 6, since it's healing more than before. Might adjust at some point if it turns out this is becoming a hindrance. 

So, yeah. The git issue has been up for nearly a month, the general consensus seemed to support changes like the ones made. Healbelly will now actually be useful, but not a complete substitute for medical or even the common medical supplies used. Chems heal brute/burn faster than the belly mode, carthatoline is faster for toxins and dexalin plus is *much* faster. On top of that, we've had a rather robust brute/burn heal value for a long-ass time -faster than bicar/kelo -  and I can't really recall it ever coming up in Medical. I don't think I've ever had a patient "stolen" and healed up before I got there because of the healbelly existing. So, halving that value and giving the belly a broader range of healed damage types shouldn't cause a problem. This PR will likely be open for a looooong time considering everything's frozen, so we'll have plenty of time to discuss it further.

Now, what does this actually mean for Patients?
If you're okay with it, you can be healed pretty reliably through the vore panel. Your prefs matter, some Medical players will likely throw the Heal effect on whatever 'belly' you choose. It can take a few minutes to heal up to full health, providing nothing else is actively damaging you. It's a bit slower than chems, but I feel like that doesn't really matter, cause it's vore. Should go without saying that just because this is an option doesn't mean you'll always get treated this way. If you get upset because you get hurt and Medical comes by with chems and a first aid kit instead of swallowing you, am sorry, they aren't obligated to, even if you request it. It's a two-way thing.

For Medical, you now have a rather decent tool to use, should you want to use it. It only heals the 5 main damage types - brute, burn, toxin, oxy, genetic. It does not bandage or disinfect, so it's not a good idea to use this on someone still bleeding or go without infection treatment. You won't be able to monitor the patients vitals unless their sensors are on and you're viewing the monitor, so it's best to make sure they're stabilizing before leaving them in. It won't cure disabilities caused by resleeving, you'll still need ryetalyn or an upgraded sleever for that. Please keep everyone's prefs in mind and don't force the Healbelly as the only way you'll help a patient, it'd be unfair to players who just want regular treatment, make sure you have the usual gear in your bag and medbelt so you can help them, too. LOOC if you want to make sure it's okay! 

Expedition/Gateway Teams/Etc, please don't abuse this and make it the new meta. I was honestly on the fence about these changes to start with because I was worried that it'd just be used as a replacement for medical, when the change is intended to give Medical a way to better incorporate scenes and vore into a job that often crushes opportunities to *have* scenes in the first place. I guess one way to put it is, "This is the only way to save you, Medical wouldn't get here in time" is okay, but "Don't bother calling Medical, I can fix you" is perhaps a bit less fine, yeah? If it's abused badly, we'll have to tweak the nutrition costs and heal values and overall nerf it, and I really hate nerfing things in general so please be nice <3
2019-01-19 05:08:59 -06:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
TheFurryFeline
ad065f1aea Boost Belly Limit
There will now be a maximum of 30 bellies for those crazy enough to spend the time and those too lazy to use text documents for that. >W>
2019-01-06 14:57:54 -05:00
Spades
2c288ee62b Merge pull request #4624 from Verkister/patch-30
Fixes food not getting digested on itemweak.
2019-01-05 00:01:35 -05:00
Spades
68401ebe5e Merge pull request #4594 from Novacat/nova-survival
Ports synth overheating fixes
2019-01-04 23:58:14 -05:00
Verkister
d90593d689 Fixes food not getting digested on itemweak.
Well it would have been digesting if the belly had enough damage to oneshot it with the slow code. The problem was just that the itemweak mode was only applying one single hit on the food before excluding it from the loop for some reason.
2019-01-01 13:58:46 +02:00
Spades
00b3a05354 Merge pull request #4603 from Verkister/eww
Adds blacklist for item ingestion (borg and trashcanfolk)
2018-12-22 09:13:27 -05:00
Spades
770e5b088b Merge pull request #4574 from Verkister/contauring
Some taur contrast tweaks. (And dual color alraune)
2018-12-22 09:12:19 -05:00
Verkister
4c5cc9881a Adds blacklist for item ingestion (borg and trashcanfolk)
-Certain items previously blacklisted for digestion can still be eaten. (pAI, posibrain, AIcard, handtele beacon)
-Implemented for borg sleepers and trash eaters to prevent ABOOSE
2018-12-21 12:19:23 +02:00
Unknown
2739c2b837 Ports synth overheating fixes
This PR ports a fix from Chompstation regarding synths overheating in bellies. Hopefully it works here.
2018-12-18 14:03:04 -05:00
Mewchild
7477c696dc Updates Fluff Item 2018-12-14 13:21:49 -06:00
Verkister
4a2d895ced Code part for colorable alraune 2018-12-13 13:37:24 +02:00
Spades
37932732ca Merge pull request #4575 from Screemonster/stopfuckingwiththepomdamnit
makes the pompom uncontaminatable
2018-12-12 21:24:11 -05:00
Spades
531bd6a7eb Merge pull request #4562 from Verkister/patch-27
Disables PDA contamination.
2018-12-12 21:22:15 -05:00
Spades
d46b03c2ca Merge pull request #4542 from Verkister/yeehowlayer
Fixes some layering issues on taur/borg riding.
2018-12-12 21:18:52 -05:00
Screemonster
10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Spades
5fe51f64ad Merge pull request #4507 from Verkister/patch-25
Fixes ingested organs giving way too much fat
2018-12-08 21:14:38 -05:00