Yoshax efe66153ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dnalockframework ...

# Conflicts:
#	code/modules/projectiles/gun.dm

2016-06-01 00:47:52 +01:00

..

__defines

Make FBPs Constructable

2016-05-30 02:13:55 -04:00

_compatibility/509

…

_helpers

Underwear + setup merges (#1812)

2016-05-30 19:19:45 +01:00

_onclick

Underwear Datums (#1794)

2016-05-29 17:29:36 +01:00

ATMOSPHERICS

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

controllers

Final Initial Implementation of Xenobio2 System.

2016-05-25 14:11:37 -04:00

datums

Merge pull request #1806 from VOREStation/limbprinter

2016-05-31 15:50:32 -04:00

defines

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

game

Make Exosuit Fabs Great Again

2016-05-31 18:45:08 -04:00

js

…

modules

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

2016-06-01 00:47:52 +01:00

unit_tests

Adds an 'Active Edges' map test

2016-05-20 00:11:49 -04:00

ZAS

…

_macros.dm

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

_unit_tests.dm

…

global.dm

Generic Station & System Name

2016-05-16 15:34:03 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Final Initial Implementation of Xenobio2 System.

2016-05-25 14:11:37 -04:00