cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,287 Commits 10 Branches 0 Tags
abeed2abbe02b90e7395e1ec315a287a68b0324c
Commit Graph

33507 Commits

Author SHA1 Message Date
Spades
abeed2abbe Merge pull request #4527 from VOREStation/upstream-merge-5737 
[MIRROR] Adds logging to special world reboots, admins with debug access can now reboot while world is OOM'd
 2019-02-23 11:28:27 -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
420803122b re-fixes this file since it wasn't obvious I was a brainlet before. 2019-02-20 23:50:07 +01: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
Sebbe9123
d329ad5fe8 Re-adds mouse because someone lazy comment. 2019-02-18 10:55:57 +01:00
Sebbe9123
fcd8665632 re-adds wolfgirls and catgirls to crates. 2019-02-18 10:49:08 +01:00
Sebbe9123
0ad302c3d1 Re-adds birbs and fennecs to the hydro crates. 2019-02-18 10:47:39 +01:00
Sebbe9123
b6b4980ea8 Fixes largecrates for real, i'm a fucking brainlet. 2019-02-18 10:46:07 +01:00
Sebbe9123
f95e5bae68 Fixes up science cargo packs, Oties disabled. 2019-02-18 10:42:23 +01:00
Sebbe9123
c0e0afe919 Fixes most crates in largecrave_vr. Oties still broke. 2019-02-18 10:25:28 +01:00
Sebbe9123
bd89126955 Fixes random_vr except oties 2019-02-18 09:08:36 +01:00
Sebbe9123
5b163c44a8 Updates Mob_spawner_vr to new paths. 
All the old paths have updated new ones besides the broken Otie.
 2019-02-18 08:50:53 +01:00
Unknown
fbeefa1215 [5737] Makes this PR compile 2019-02-17 17:20:58 -05:00
Unknown
16d599c05a [AI BRANCH] Attempt to fix Active Edge 2019-02-16 23:46:26 -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
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