PsiOmega
|
0cc60870f5
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-03-13 09:31:03 +01:00 |
|
Chinsky
|
64a94a5043
|
Fixes #8438
Removed spawn based on suggestion, doesn't seem to cause that graphical glitch it was against.
|
2015-03-12 17:00:53 +03:00 |
|
PsiOmega
|
7e498e1cf7
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
|
2015-02-27 09:06:48 +01:00 |
|
mwerezak
|
6d15809768
|
Corrects return values for the Topic procs of several computers and some other machines as well.
|
2015-02-25 21:32:35 -05:00 |
|
Chinsky
|
9e1a2315cd
|
Changes loop for space tiles from world one to for over coordinates. It would raise infinite loop warnings otherwise when used with big zlevels.
|
2015-02-22 11:13:09 +03:00 |
|
Chinsky
|
18607897f0
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
|
2015-02-21 21:47:16 +03:00 |
|
Chinsky
|
cbe030b56e
|
Compile fix
|
2015-02-03 08:39:39 +03:00 |
|
Chinsky
|
2a1f0849d8
|
Cleaned out my WIP folder.
|
2015-02-03 08:27:18 +03:00 |
|