Arokha Sieyes bf1f407e14 Merge pull request #1376 from VOREStation/actually-fix-holocarp ...

Actually make holocarp not delete you when derezzing.

2017-04-10 20:30:58 -04:00

..

__defines

Merge branch 'master' into vplk-persist

2017-04-04 21:44:28 -04:00

_compatibility/509

…

_helpers

Merge pull request #1343 from VOREStation/aro-sync

2017-04-04 20:52:03 -04:00

_onclick

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

2017-04-01 19:19:42 -04:00

ATMOSPHERICS

…

controllers

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

2017-04-01 19:19:42 -04:00

datums

Fix up a few more things with synth printing

2017-04-09 23:56:13 -04:00

defines

Merge pull request #1343 from VOREStation/aro-sync

2017-04-04 20:52:03 -04:00

game

Communicator fixes

2017-04-06 18:08:13 -04:00

js

…

modules

Merge pull request #1376 from VOREStation/actually-fix-holocarp

2017-04-10 20:30:58 -04:00

unit_tests

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

ZAS

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak

2017-03-24 16:35:31 -05:00

_macros.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Fixes a bug with some languages

2017-03-31 17:52:15 +01:00

world.dm

…