cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
9dd973221d1ca8fde6c3baff704f3ca780c97bb7
CHOMPStation2/code/modules
History
Cameron653 9dd973221d Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
..
admin
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
ai
Merges AI Branch into Master
2018-12-01 00:06:38 -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
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
busy_space_vr
…
client
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
clothing
Merge pull request #5730 from Nalarac/patch-2
2018-11-09 22:05:35 -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
…
events
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -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
Resolves some merge conflicts
2019-01-05 16:29:19 -05:00
gamemaster
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
games
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
genetics
…
ghosttrap
…
holodeck
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
holomap
Might fix the server startup error_handler runtime
2018-08-30 22:59:15 -05:00
hydroponics
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
icon generation
…
integrated_electronics
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
library
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05:00
lighting
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
lore_codex
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
maps
Critical maploader fix
2018-10-13 01:36:26 -04:00
materials
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
media
…
metric
…
mining
Nerfs Cash from Mining Vendor
2018-10-20 14:50:43 -04:00
mob
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -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
Merge pull request #4293 from VOREStation/aro-nifgibdrop
2018-10-01 09:29:29 -04:00
organs
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
overmap
NanoUI now processes again
2018-08-25 21:13:16 -07:00
paperwork
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
persistence
…
planet
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
power
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
projectiles
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
random_map
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
reagents
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
recycling
Graves (#5622)
2018-10-13 17:58:48 -04:00
research
Merge pull request #5648 from king5327/polarissciconfix
2018-10-13 17:14:48 -04:00
resleeving
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
rogueminer_vr
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05: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
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
shuttles
Missed one.
2019-01-05 17:01:01 -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
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
tension
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
tooltip
…
turbolift
…
vehicles
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
ventcrawl
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
virus2
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
2018-09-27 18:01:09 -04:00
vore
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
xenoarcheaology
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05: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
…