cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-22 07:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
bd8c62bde8c7c0f3db7b2a02082d39730bb74d39
CHOMPStation2/code/modules
History
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
..
admin
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
ai
Merge branch 'master' into upstream-merge-5758
2019-03-02 08:01:51 -05:00
alarm
…
artifice
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
assembly
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
awaymissions
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
blob
…
blob2
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
busy_space
…
busy_space_vr
…
client
Merge pull request #4805 from Sebbe9123/master
2019-03-02 08:03:58 -05:00
clothing
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
customitems
…
detectivework
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
economy
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
entopics_vr
…
error_handler
ports #4581 Startup Runtime fix
2019-02-02 06:03:40 -06:00
events
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
examine
…
ext_scripts
…
flufftext
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
food
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
gamemaster
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
games
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
genetics
…
ghosttrap
…
holodeck
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
holomap
ports #4581 Startup Runtime fix
2019-02-02 06:03:40 -06:00
hydroponics
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
icon generation
…
integrated_electronics
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
library
…
lighting
…
lore_codex
…
maps
Merge pull request #4552 from VOREStation/upstream-merge-5748
2019-02-23 11:45:49 -05:00
materials
Merge pull request #5747 from Neerti/fulltile_window_improvements
2018-12-04 14:37:19 -05:00
media
…
metric
…
mining
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
mob
Merge pull request #4557 from VOREStation/upstream-merge-5758
2019-03-02 08:09:55 -05:00
multiz
Conflicts resolved, excluding the .dme
2019-01-05 16:38:33 -05:00
nano
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
nifsoft
[5654] Makes this PR Compile
2019-02-23 12:30:16 -05:00
organs
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
overmap
…
paperwork
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
persistence
…
planet
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
power
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
projectiles
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
random_map
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
reagents
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
recycling
Graves (#5622)
2018-10-13 17:58:48 -04:00
research
size control implant
2018-12-08 17:12:33 +07:00
resleeving
[5654] Makes this PR Compile
2019-02-23 12:30:16 -05:00
rogueminer_vr
Un-edits and fixes mobpaths.
2019-02-18 11:34:12 +01:00
scripting
…
security levels
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
shieldgen
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
shuttles
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
spells
Conflicts resolved, excluding the .dme
2019-01-05 16:38:33 -05:00
surgery
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
tables
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
telesci
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
tension
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
tooltip
…
turbolift
[5654] Makes this PR Compile
2019-02-23 12:30:16 -05:00
vehicles
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
ventcrawl
oh my fuck travis quit complaining
2019-02-02 08:17:32 -06:00
virus2
Feedback Changes 1
2018-10-24 23:27:34 -04:00
vore
Merge pull request #4805 from Sebbe9123/master
2019-03-02 08:03:58 -05:00
xenoarcheaology
retries a fix I did before.
2019-02-22 17:48:08 +01:00
xenobio
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
xenobio2
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
xgm
…