cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 15:19:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,236 Commits 8 Branches 26 Tags
6f2548e47bb3d42cdc20b3def8dcd40bbe82b983
Commit Graph

21859 Commits

Author SHA1 Message Date
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00
Spades
30ab44613d Merge pull request #4540 from VOREStation/upstream-merge-5714 
[MIRROR] Borg, Gripper, and Integrated Circuit interaction update.
 2019-01-21 11:42:38 -05:00
Sebbe9123
b0735ffa88 Adds Fluffy. 2019-01-21 09:15:55 +01:00
Sebbe9123
b556acac8f Adds Foxes and Renault. 2019-01-21 09:14:46 +01:00
Sebbe9123
a78bc1a73c Adds Poisionous Koi. 2019-01-21 09:13:10 +01:00
Sebbe9123
79345970e4 Adds space mobs. Mimic, snake(noodle), Gaslamp. 2019-01-21 09:12:03 +01: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
Spades
fb6f5e33ca Corrected commented code 2019-01-11 22:33:53 -05:00
Spades
096ae8e226 Disables Shadekin smite because no shadekin 2019-01-11 22:32:13 -05:00
Spades
1927479ce7 Revert "Moves all old mobs to a legacy mob folder" 
This reverts commit 9a4f291859.
 2019-01-11 21:51:53 -05:00
Spades
9a4f291859 Moves all old mobs to a legacy mob folder 2019-01-11 21:49:43 -05:00
Spades
fc959cd1e8 Removes redundant files 2019-01-07 09:36:11 -05:00
Verkister
890803e0c6 Fixes movement draining nutrition below negatives 
And these negative numbers were apparently breaking the weight loss and examination messages.
 2019-01-06 15:46:20 +02:00
Spades
fc2f451bd4 Merge pull request #4586 from Verkister/boyidie 
Fixes undefined z-levels shitting caves all over the place
 2019-01-05 17:02:33 -05:00
Spades
1d6d0b75ae Missed one. 2019-01-05 17:01:01 -05:00
Spades
5cb647993c Conflicts resolved, excluding the .dme 2019-01-05 16:38:33 -05:00
Spades
58e4a98a94 Breaks a Vorestation Edit in death.dm 
Nobody wants to help me fix these things so I'm just going to break them
and see what happens.
 2019-01-05 16:35:07 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Spades
81f7b979c2 Merge pull request #4628 from Heroman3003/shellguard-fix 
Fixes shellguard-noble sprites not actually having sprites
 2019-01-05 00:04:40 -05:00
Spades
ac93866ddc Merge pull request #4610 from Heroman3003/borg-making-fix 
Fixed creation of borgs through non-spawn method
 2019-01-05 00:03:32 -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
35c54b4324 Merge pull request #4614 from Novacat/nova-heterochromia 
Virgo Language Fixes
 2019-01-05 00:01:15 -05:00
Spades
8c1b8aacb2 Merge pull request #4550 from Zap-zapper/size-im 
Size control implant
 2019-01-04 23:59:17 -05:00
Spades
68401ebe5e Merge pull request #4594 from Novacat/nova-survival 
Ports synth overheating fixes
 2019-01-04 23:58:14 -05:00
Heroman3003
cae9207bae Fixes shellguard-noble sprites not actually having sprites 2019-01-03 06:45:22 +10:00
Ketrai
4c62b1abde Fixes nutriment stacking 
Currently cooking the pizza caused the intended amount of nutriment to be too high. This fixes it.
 2019-01-02 00:36:27 +01:00
Ketrai
257a7809d0 Update snacks_vr.dm 2019-01-01 17:39:20 +01:00
Ketrai
1841614d78 Update snacks_vr.dm 2019-01-01 17:05:42 +01:00
Ketrai
681f52123f Update snacks_vr.dm 2019-01-01 16:40:00 +01:00
Ketrai
1c43cfd638 Update snacks_vr.dm 2019-01-01 16:22:29 +01:00
Ketrai
f93b25b1c9 Update recipes_microwave_vr.dm 2019-01-01 15:57:21 +01:00
Ketrai
e37cf040b4 Update snacks_vr.dm 2019-01-01 15:50:13 +01: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
Unknown
1b948808a0 Virgo Language Fixes 
Fixes #4613 and Fixes #4217
 2018-12-28 09:03:22 -05:00
Heroman3003
93dc10a89c Fixed creation of borgs through non-spawn method 2018-12-23 11:18:55 +10:00
Spades
3ba4a9005a Merge pull request #4567 from Novacat/nova-pathfinder 
Adds Ascian's Shelter Capsule
 2018-12-22 09:41:02 -05: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
Spades
73335f0037 Merge pull request #4588 from Mewchild/MC-fluff 
Updates Fluff Item
 2018-12-22 09:12:00 -05:00
Spades
31c15ac3bc Merge pull request #4495 from ArgobargSoup/ArgoCollar 
Collar tweaks
 2018-12-22 09:10:28 -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
Spades
1c92c06771 Merge pull request #4584 from Novacat/nova-heterochromia 
Replaces Ace's ammo with HP
 2018-12-14 11:29:42 -05:00
Spades
dd0a71d6b4 Merge pull request #4488 from Verkister/yeehow 
Enables riding for a bunch of animals.
 2018-12-14 11:28:32 -05:00
Unknown
7a22b9767c Adds Ascian's Shelter Capsule 
- Adds Silver-trimmed shelter capsule, a luxury capsule that has a redecorated interior and some extra food, drink, and emergency supplies.
- Fixes issue where Shelter capsule pod beds started with no padding
 2018-12-13 21:28:24 -05:00
Verkister
447e0a8340 Fixes undefined z-levels shitting caves all over the place 
-Basically just gives the tether lateload z-levels actual z-levels and assigns them for use.
-Also moves the cave/ore generation for beach cave and V2 caves for the actual map loader instead of some awaymap temp objects that had apparently didn't have enough concept for proper z definitions.
-Fixes the forementioned things constantly bugging out and spawning all those caves and ores into the surface level foundations.

-Also fixes PoIs getting squished at least until Polaris gets their shit together with yet another submap rotation refactor.

God let me get some fucking rest fsghjasf
 2018-12-14 01:15:28 +02:00
Verkister
4a2d895ced Code part for colorable alraune 2018-12-13 13:37:24 +02:00
Unknown
b48efb138f More merge conflict fixes 
I think I got them all.
 2018-12-13 00:33:32 -05:00