Anewbe 28caa29467 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scratch_damage ...

# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm

2017-04-19 12:55:11 -05:00

..

__defines

Merge pull request #3286 from VOREStation/smooth-lighting

2017-04-15 22:52:42 -05:00

_compatibility/509

…

_helpers

Merge pull request #3286 from VOREStation/smooth-lighting

2017-04-15 22:52:42 -05:00

_onclick

Fixes a few errors.

2017-04-11 00:39:21 -07:00

ATMOSPHERICS

Fixes scrubber Phoron scrubbing

2017-04-13 22:32:40 +01:00

controllers

Merge pull request #3305 from VOREStation/aro-pol-planets

2017-04-16 01:30:55 -04:00

datums

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

2017-04-07 16:11:50 -05:00

defines

Fixed various hand sprite issues.

2017-04-04 08:29:53 +01:00

game

Merge pull request #3307 from LorenLuke/Blast-Door

2017-04-19 10:32:37 -05:00

js

…

modules

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

2017-04-19 12:55:11 -05: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

Multi-Z code formatting and utilities.

2017-04-17 11:57:49 -04:00

_unit_tests.dm

…

global.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00