Neerti 2daac2d647 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks ...

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

2016-02-06 01:55:02 -05:00

..

__defines

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

_helpers

Added ceil() macro, replaced n_ceil() as GN said.

2016-02-01 04:12:11 +10:30

_onclick

Merge pull request #810 from Zuhayr/bayupdate

2016-02-05 23:21:07 -05:00

ATMOSPHERICS

Merge pull request #810 from Zuhayr/bayupdate

2016-02-05 23:21:07 -05:00

controllers

Merge pull request #810 from Zuhayr/bayupdate

2016-02-05 23:21:07 -05:00

datums

Merge pull request #810 from Zuhayr/bayupdate

2016-02-05 23:21:07 -05:00

defines

Surface rename of Seromi to Teshari.

2016-02-06 12:50:16 +10:30

game

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks

2016-02-06 01:55:02 -05:00

js

…

modules

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks

2016-02-06 01:55:02 -05:00

ZAS

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

_macros.dm

…

global.dm

Fixes #755

2016-01-13 23:51:45 +10:30

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

add revision topic call

2016-01-09 18:12:13 +00:00