Repede 46577b7321 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/game/mecha/combat/gorilla.dm
#	code/modules/vore/eating/bellymodes_vr.dm

2018-03-06 18:11:39 -05:00

..

__defines

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-03-06 18:11:39 -05:00

_compatibility/509

…

_helpers

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-03-06 18:11:39 -05:00

_onclick

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

ATMOSPHERICS

Re-adds Eris tank sprites that were verwritten during sync

2018-02-28 13:49:38 -05:00

controllers

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-03-06 18:11:39 -05:00

datums

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-28 22:06:46 -05:00

defines

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2018-03-03 13:09:57 -05:00

game

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-03-06 18:11:39 -05:00

js

…

modules

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-03-06 18:11:39 -05:00

unit_tests

VS: Rewrites basically all of how bellies work

2018-02-27 13:29:45 -05:00

ZAS

Revert "Reverse floor decal removal commit 00f8ae5"

2018-03-02 20:04:08 -05:00

_away_mission_tests.dm

…

_macros_vr.dm

Make syringe reuse a bad idea

2018-02-28 20:03:18 -05:00

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global_yw.dm

…

global.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-28 22:06:46 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2018-02-27 21:27:35 -05:00

world.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-28 22:06:46 -05:00