cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-12 00:45:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,835 Commits 9 Branches 26 Tags
690dc5cbecdafb59df8753bfae72176e3d2f8e54
Commit Graph

1240 Commits

Author SHA1 Message Date
Unknown 3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Novacat 1aa2f39c0f Merge pull request #4815 from Novacat/nova-aifixes 
Fixes Newspapers
 2019-03-28 21:29:07 -04:00
Novacat 44e3511842 Merge pull request #4812 from TheFurryFeline/patch-1 
Add Resh's HOS Coat
 2019-03-28 21:28:50 -04:00
Novacat ada7fcd1c4 Merge pull request #4764 from Sharkmare/patch-4 
minor spelling fix
 2019-03-28 20:23:01 -04:00
Novacat b88035052b Update persist_vr.dm 2019-03-28 20:10:57 -04:00
Novacat 65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
 2019-03-28 18:17:11 -04:00
Novacat 9759df2de4 Merge pull request #4756 from TheFurryFeline/TFF-Vakashi_Permit 
Vakashi's Permit
 2019-03-28 17:40:23 -04:00
Unknown ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
Novacat 77db377d61 Merge pull request #4748 from Heroman3003/mlembulance 
Tempest's saddlebags now double as ambulance siren/light
 2019-03-28 16:39:37 -04:00
Novacat f98177b682 Merge pull request #4741 from Jwguy/Silver-KoyoFluffApp 
Adds Koyo's Fluff Item Box
 2019-03-28 16:34:41 -04:00
Unknown cf39c61c2d Conflict Resolution 
This one made a lynx cry.
 2019-03-28 13:19:19 -04:00
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
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
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
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