PsiOmegaDelta
|
120ce3f20c
|
Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
Conflicts:
code/modules/admin/topic.dm
|
2015-08-20 14:16:35 +02:00 |
|
Zuhayr
|
c8b6813426
|
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
Uplink Items - Part III
|
2015-08-20 19:19:12 +09:30 |
|
PsiOmega
|
c51e208094
|
One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.
|
2015-08-15 15:22:37 +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 |
|
PsiOmegaDelta
|
457987046b
|
Re-implements world end events as datums.
|
2015-07-07 23:09:03 +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 |
|