PsiOmegaDelta
|
fc4c1d6af7
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
|
2015-10-16 11:04:43 +02:00 |
|
PsiOmegaDelta
|
1b10f78940
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/mob/living/carbon/human/life.dm
|
2015-08-13 09:01:10 +02:00 |
|
PsiOmega
|
ba240cb768
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
|
2015-08-12 21:18:18 +02:00 |
|
Chinsky
|
026500ea06
|
Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade
|
2015-06-05 11:26:25 +03: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 |
|