Aronai Sieyes 29ae148dcf Merge pull request #3244 from VOREStation/aro-infectheal ...

Prevent infections from healing you, small tweaks

2018-03-16 19:54:38 -04:00

..

__defines

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

2018-03-15 22:41:14 -04:00

_compatibility/509

…

_helpers

Merge branch 'master' into polaris-sync-2018-03-15

2018-03-16 14:23:12 -04:00

_onclick

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

2018-03-15 22:41:14 -04:00

ATMOSPHERICS

Fix pipe construction conflicting with existing pipes too much.

2018-03-09 12:36:43 -05:00

controllers

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

2018-03-15 22:41:14 -04:00

datums

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

2018-03-15 22:41:14 -04:00

defines

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

2018-03-15 22:41:14 -04:00

game

Fixup wings and custom vorestation tails to the new update_icons() system.

2018-03-16 00:46:10 -04:00

js

…

modules

Merge pull request #3244 from VOREStation/aro-infectheal

2018-03-16 19:54:38 -04:00

unit_tests

…

ZAS

Port SSoverlays & Convert turfs to use it (#5004)

2018-03-05 19:43:23 -06: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.dm

POLARIS: Moves daily logs into being folders rather than files

2018-03-10 17:18:55 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

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

2018-03-15 22:41:14 -04:00

world.dm

Merge pull request #3211 from VOREStation/aro-topic

2018-03-12 18:27:39 -04:00