cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 23:46:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
5d5f052eb744c191ad494868bef7de365091456e
CHOMPstation/code
T
History
Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
..
__defines
Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
2018-01-15 13:27:39 -05:00
_compatibility/509
…
_helpers
POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.
2018-01-14 23:00:10 -05:00
_onclick
POLARIS: The return of the material scanner overlay
2018-01-14 19:26:54 -05:00
ATMOSPHERICS
Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
2018-01-09 14:40:09 -05:00
controllers
Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
2018-01-09 14:40:09 -05:00
datums
Refactor Digestion
2018-01-10 02:06:13 -05:00
defines
VS: Planes shenanigans. Begins 'plane' work, for VS specific things.
2018-01-14 00:40:00 -05:00
game
Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
2018-01-15 13:27:39 -05:00
js
…
modules
Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
2018-01-15 13:27:39 -05:00
unit_tests
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
2018-01-04 22:44:04 -05:00
ZAS
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
2018-01-04 22:44:04 -05:00
_macros.dm
Ports hoists, as well as some macros, from Aurorastation. (#4451)
2018-01-01 12:17:35 -08:00
_map_tests.dm
…
_unit_tests.dm
…
global_vr.dm
New Science Dogborg
2018-01-07 00:05:10 -05:00
global.dm
POLARIS: Planes shenanigans. Begins 'plane' work.
2018-01-14 00:39:59 -05:00
hub.dm
…
names.dm
…
stylesheet.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
2017-12-26 23:07:58 -05:00
world.dm
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
2018-01-04 22:44:04 -05:00