PsiOmegaDelta
|
6a22086c17
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
|
2015-12-06 11:34:36 +01:00 |
|
PsiOmegaDelta
|
713a7bd654
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/items/devices/flashlight.dm
|
2015-08-25 08:12:39 +02:00 |
|
PsiOmega
|
f25e8a7a67
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
|
2015-06-26 20:28:47 +02:00 |
|
Zuhayr
|
27a7768ffc
|
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
|
2015-06-25 17:58:37 +09:30 |
|
Mloc
|
c1ce2f02b7
|
reorganize xgm into its own module
Signed-off-by: Mloc <colmohici@gmail.com>
|
2015-06-02 16:29:23 +01:00 |
|