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
Files
71d1a05531e0f5f601ad99fb11670cd1048e4cdb
VOREStation/code/modules
History
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
..
admin
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -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
…
busy_space_vr
…
client
Merge branch 'master' into upstream-merge-5744
2019-02-23 11:51:40 -05:00
clothing
Merge branch 'master' into upstream-merge-5744
2019-02-23 11:51:40 -05:00
customitems
…
detectivework
…
economy
…
entopics_vr
…
error_handler
ports #4581 Startup Runtime fix
2019-02-02 06:03:40 -06:00
events
Merge pull request #4538 from VOREStation/upstream-merge-5726
2019-02-23 12:01:38 -05:00
examine
…
ext_scripts
…
flufftext
…
food
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -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
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
ports #4581 Startup Runtime fix
2019-02-02 06:03:40 -06: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 pull request #4543 from VOREStation/upstream-merge-5747
2019-02-25 08:57:19 -05:00
mob
Merge pull request #4543 from VOREStation/upstream-merge-5747
2019-02-25 08:57:19 -05:00
multiz
Conflicts resolved, excluding the .dme
2019-01-05 16:38:33 -05:00
nano
…
nifsoft
…
organs
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
overmap
…
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
Merge pull request #4538 from VOREStation/upstream-merge-5726
2019-02-23 12:01:38 -05:00
projectiles
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
random_map
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
reagents
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
recycling
…
research
size control implant
2018-12-08 17:12:33 +07:00
resleeving
…
rogueminer_vr
Un-edits and fixes mobpaths.
2019-02-18 11:34:12 +01:00
scripting
…
security levels
…
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
…
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
…
ventcrawl
oh my fuck travis quit complaining
2019-02-02 08:17:32 -06:00
virus2
…
vore
Fixes Spirit for AI Overhaul
2019-02-20 12:26: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
…