cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,370 Commits 7 Branches 0 Tags
42bf34b2ef2190b89cd5d6ab91f4abe4a9993b4c
Commit Graph

21919 Commits

Author SHA1 Message Date
Neerti
42bf34b2ef Merge pull request #6006 from PrismaticGynoid/crashedescapepods 
Adds 3 new crashed escape pod PoIs
 2019-03-20 15:50:28 -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
Heroman
87f89f2728 Fixed elevator button being borked 2019-03-03 18:16:02 +10:00
Spades
76633d35b2 Merge pull request #4566 from VOREStation/upstream-merge-5746 
[MIRROR] Adds like 4 million articles.
 2019-03-02 08:24:45 -05: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
Unknown
690ecfdbdf Fixes Digestion Toggle 
...Not sure why this was disabled, it is an easy fix.
 2019-03-01 19:35:36 -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
1a02378f70 Merge pull request #4556 from VOREStation/upstream-merge-5744 
[MIRROR] Adds 12 new futuristic loadout clothing items + colour variants
 2019-02-25 07:46:24 -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
22c9bd416e changes vore eggtype to not mess with mob eggtype 2019-02-25 12:03:07 +01: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
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
4b19e3a9b3 Merge pull request #4538 from VOREStation/upstream-merge-5726 
[MIRROR] Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed
 2019-02-23 12:01:38 -05:00
Spades
14fad52791 Merge branch 'master' into upstream-merge-5744 2019-02-23 11:51:40 -05:00
Spades
190ead1dfd Merge pull request #4552 from VOREStation/upstream-merge-5748 
[MIRROR] Adds ability to selectively disable submap rotation.
 2019-02-23 11:45:49 -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
Sebbe9123
aabb168bf4 retries a fix I did before. 2019-02-22 17:48:08 +01:00
Sebbe9123
dea8170bc0 Removes an indentation someone made. 2019-02-22 17:14:02 +01: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
Sebbe9123
47163d685d Adds Carp since it was removed... for some reason. 2019-02-20 20:37:44 +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
Sebbe9123
ad35326865 Un-edits and fixes mobpaths. 2019-02-18 11:34:12 +01:00
Unknown
e4425a700d [5747] Makes this PR compile again 2019-02-17 01:34:20 -05:00
Poojawa
4e6156a180 swaps files because why not 2019-02-02 08:25:57 -06:00
Poojawa
2e7e39c359 oh my fuck travis quit complaining 
Travis doesn't like comments in the lists.
 2019-02-02 08:17:32 -06:00
Poojawa
4f671f32ec Update ventcrawl.dm 
fucking indentation memes
 2019-02-02 08:12:20 -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
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -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