Datraen
|
ca24446d7f
|
Merge pull request #1287 from Kelenius/unitTests
Ports unit tests
|
2016-04-04 10:34:12 -04:00 |
|
Datraen
|
41996815ae
|
Gives categorization to the preferences as per the current staff structure.
|
2016-03-31 16:30:13 -04:00 |
|
Kelenius
|
c8b510b415
|
Adds unit tests
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
|
2016-03-29 17:42:22 +03:00 |
|
Yoshax
|
5d9596a72d
|
Makes it possible to have more than 16 preferences
|
2016-03-21 18:56:27 +00:00 |
|
Zuhayr
|
71214d859e
|
Merge with master.
|
2015-08-18 11:31:10 -07:00 |
|
PsiOmega
|
fc6de24042
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
|
2015-06-07 10:51:41 +02:00 |
|
Chinsky
|
bf53304fec
|
Splits setup.dm into berjillion of smaller files vaguely named thematically.
Also moved __HELPERS and _defines around so defines actually come first.
|
2015-06-04 21:51:58 +03:00 |
|