cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,291 Commits 8 Branches 26 Tags
14fad52791e7ff225299066a00a7e6e2aff44e30
Commit Graph

9736 Commits

Author SHA1 Message Date
Spades
172f2088db Merge pull request #4790 from Sebbe9123/upstream-merge-5735 
More AI fixes, fixes crates, spawners, adds ION spiders and MORE.
 2019-02-22 20:42:29 -05:00
Unknown
f74f7c3e42 Ports Shadekin (Minus AI) 2019-02-21 20:47:22 -05:00
Unknown
5d28c9f326 Enables most Virgo mobs 
Grub, Oties, and Shadekin Not included
Temporarily disables Mob riding
 2019-02-21 18:53:59 -05:00
Sebbe9123
b0bc86103d WHY THE FUCK CAN'T I UPLOAD STRAIGHT INTO THE RIGHT FOLDER. 2019-02-20 21:55:16 +01:00
Unknown
4fd5615cda Fixes runtimes, readds runtime belly 2019-02-20 14:01:01 -05:00
Unknown
c055bb3957 Fixes whitespace stuff 2019-02-20 12:26:58 -05:00
Unknown
29c4f7d36b Removes job check 2019-02-20 12:26:58 -05:00
Unknown
beb1672988 Follow script should be included in check 2019-02-20 12:26:58 -05:00
Unknown
de18c9321f Fixes Spirit for AI Overhaul 
- Also fixes an error with Phi's ring
 2019-02-20 12:26:58 -05:00
Poojawa
4e6156a180 swaps files because why not 2019-02-02 08:25:57 -06:00
Poojawa
a9d025b1f0 Shifts vore mobs to proper locations, cleans loose folder 
also attempts a Travis complaint fix The command "awk -f tools/indentation.awk **/*.dm" exited with 1.
 2019-02-02 08:07:20 -06:00
Poojawa
f05675e269 Resolves compile errors 2019-02-02 04:33:13 -06:00
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
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
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
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
Heroman3003
cae9207bae Fixes shellguard-noble sprites not actually having sprites 2019-01-03 06:45:22 +10: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
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
Spades
dd0a71d6b4 Merge pull request #4488 from Verkister/yeehow 
Enables riding for a bunch of animals.
 2018-12-14 11:28:32 -05:00
Spades
670e5e3765 Merge pull request #4523 from VOREStation/upstream-merge-5718 
[MIRROR] New hair + underwear
 2018-12-12 21:24:49 -05:00
Spades
8c3c8c45c9 Merge pull request #4549 from Verkister/implantshuds 
Fixes some implant related issues.
 2018-12-12 21:19:41 -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
Spades
1111241d7d Merge pull request #4533 from Verkister/patch-26 
Fixes digestive analyzer missing sync button
 2018-12-12 21:14:53 -05:00
Verkister
c1536879b2 Fixes some implant related issues. 
-Fixes reagent implants being utterly bricked.
-Fixes backup implants not showing up in AR huds.
-Both issues were caused by implants now going way deeper into the bodyparts than before.
 2018-12-05 17:47:19 +02:00
Spades
14cc6f8440 Merge pull request #4509 from lbnesquik/Kates-Weight-Fix 
Fix stuffing breaking at extreme numbers.
 2018-12-04 20:21:31 -05:00
Verkister
3840e255c6 layer fix 2018-12-04 17:18:10 +02:00
Verkister
700a62dfee Fixes some layering issues on taur/borg riding. 
-Proper layering is no longer ignored for every non-north direction.
-Also bumped borg riding offset upwards by couple pixels to better match the back height.
 2018-12-04 17:13:48 +02:00
Atermonera
0a77d0d70d Borg, Gripper, and Integrated Circuit interaction update. 2018-12-03 20:22:47 -05:00
Spades
4579aed0ed Merge pull request #4499 from VOREStation/aro-darkphoto 
Combine photosensitive trait with darksight
 2018-12-02 13:54:08 -05:00
Verkister
d90f0bbf92 Fixes digestive analyzer missing sync button 
I have no idea how that happened.
 2018-12-02 12:36:22 +02:00
Spades
ff0ed7d103 Merge pull request #4490 from HungryMoth/BugLanguage 
Gives Vasilissans a language finally / Bug-Speak
 2018-12-01 11:02:20 -05:00
Atermonera
3fb5d15c43 Merge pull request #5718 from kartagrafi/hairunderwearwhatever 
New hair + underwear
 2018-12-01 00:17:11 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
HungryMoth
8b56ee84a9 Removed Sol Common from Vasi's 2018-11-30 23:16:24 -05:00
HungryMoth
8c1d835b38 Gives Vasilissans the language by default 2018-11-27 13:41:44 -05:00
HungryMoth
3ce47937a4 Updated Lore for Vasilissans 2018-11-27 13:36:52 -05:00