Mloc 5ab12f802a Merge pull request #1726 from Erthilo/master ...

Post Merge Fixes and Tweaks.

2012-09-24 13:06:53 -07:00

..

ATMOSPHERICS

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

controllers

Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands.

2012-09-24 17:56:49 +01:00

datums

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

defines

Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands.

2012-09-24 17:56:49 +01:00

FEA

-Small improvements to atmos. Most notable is combining two loops into one during initialization and commenting out a loop with no nested code.

2012-09-20 14:24:50 +00:00

game

Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands.

2012-09-24 17:56:49 +01:00

js

…

modules

Merge pull request #1726 from Erthilo/master

2012-09-24 13:06:53 -07:00

TriDimension

Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours...

2012-08-12 18:41:27 -07:00

unused

various mergefixes

2012-09-22 21:37:42 +10:00

WorkInProgress

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

ZAS

various mergefixes

2012-09-22 21:37:42 +10:00

global.dm

fix for internals spawning empty

2012-09-22 22:46:02 +10:00

hub.dm

fix for internals spawning empty

2012-09-22 22:46:02 +10:00

names.dm

…

setup_3d.dm

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

setup.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

stylesheet.dm

* Merged diagonal reaching.

2012-08-23 22:43:38 +01:00

world.dm

Replaces the voting system. It should fix a pretty serious server-crashing exploit and simplify the code a fair bit.

2012-09-12 00:44:13 +00:00

ZAS_defines.dm

missing files

2012-08-22 20:58:12 +10:00