cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,413 Commits 8 Branches 26 Tags
039b6c2b6ce91c2ab4eba8fde85b200e2b804a4a
Commit Graph

9768 Commits

Author SHA1 Message Date
Unknown
c8ca8efa62 Conflict Resolution 2019-03-27 02:37:20 -04:00
Mechoid
c8006a6e84 Event / Future PoI / Other weaponry & tools. 2019-03-27 02:34:28 -04:00
Unknown
e298f07340 Replaces schedule_callback_in 
...Tested the bell, hopefully the xenochimera revives also work
 2019-03-27 01:33:54 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Sebbe
706a70a643 Fixes icky voremob mistakes. 
I made some initial faults when porting voremobs in the first wave, this aims at rectifying those mistakes.
 2019-03-04 15:04:20 +01:00
Spades
43c03b3b82 Merge pull request #4565 from VOREStation/upstream-merge-5757 
[MIRROR] Adds several new map/event oriented objects
 2019-03-02 08:24:32 -05:00
Spades
af14eaef05 Merge pull request #4563 from VOREStation/upstream-merge-5756 
[MIRROR] Fixes a few AI bugs
 2019-03-02 08:24:15 -05:00
Spades
d47c2366de Merge pull request #4558 from VOREStation/upstream-merge-5760 
[MIRROR] Adds BIOACID damage type
 2019-03-02 08:10:04 -05:00
Spades
bd8c62bde8 Merge pull request #4557 from VOREStation/upstream-merge-5758 
[MIRROR] Fixes several bugs with AI mobs
 2019-03-02 08:09:55 -05:00
Spades
4320afc530 Merge branch 'master' into upstream-merge-5757 2019-03-02 08:05:51 -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
0aac0a8ebb Merge branch 'master' into upstream-merge-5756 2019-03-02 08:03:30 -05:00
Spades
f7b300ac68 Merge branch 'master' into upstream-merge-5758 2019-03-02 08:01:51 -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
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades
71d1a05531 Merge pull request #4543 from VOREStation/upstream-merge-5747 
[MIRROR] Makes fulltile windows seperate from dir
 2019-02-25 08:57:19 -05:00
Spades
aedcf169a6 Merge pull request #4539 from VOREStation/upstream-merge-5723 
[MIRROR] Promethean Regen tweaks. (The one with the devil's deal.)
 2019-02-25 07:41:47 -05:00
Sebbe9123
7d6f22ae2e gives back egg_type to nurse spider 2019-02-25 11:13:40 +01:00
Heroman3003
6740b839fc Returns ability for prometheans to eat dirt 2019-02-24 06:44:02 +10:00
Heroman3003
bffe666af7 Preserves vorestation removals while porting tweaks 2019-02-24 06:38:54 +10:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
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