Albert Iordache dd6c41ade1 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm

2012-07-13 20:58:48 +03:00

..

ATMOSPHERICS

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-07-04 09:00:59 +01:00

datums

Fixed an issue where laws would not properly be added if they were too high of a number.

2012-07-07 17:57:05 +03:00

defines

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

FEA

Working UL

2012-06-18 15:02:34 -07:00

game

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

js

…

modules

Merge branch 'master' of github.com:Baystation12/Baystation12

2012-07-13 20:58:48 +03:00

unused

UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)

2012-06-21 13:35:34 -07:00

WorkInProgress

Fixed tape quirks

2012-07-09 20:03:29 +03:00

ZAS

Final parts of ZAS. Works like a charm now.

2012-06-23 21:20:39 -07:00

access_defines.dm

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

names.dm

…

setup.dm

Found the cause of lasers not damaging humans

2012-07-05 15:09:17 +03:00

stylesheet.dm

Fixes Mods being able to use Subtle messages. Fixes mod panel. Prevents mods from seeing stealthed admins in various places. Fixes mods seeing gibbed messages. Changed colours to be more readable, mod say is now brown.

2012-06-02 21:17:37 +01:00