caelaislinn f1782ec017 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/WorkInProgress/Cael_Aislinn/energy_field.dm
	code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm
	code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>

2012-06-16 12:02:29 +10:00

..

ATMOSPHERICS

TG: Welding tool: Mostly code-related, the players won't notice much.

2012-06-07 03:30:13 +01:00

datums

TG: - Deleted ERP.dmi

2012-06-07 02:41:38 +01:00

defines

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

2012-06-16 12:02:29 +10:00

FEA

Merge pull request #1191 from Mloc/varfix

2012-05-30 11:07:27 -07:00

game

Revert All of Cael_Aislinn's stuff from the last day, committed by Cib.

2012-06-15 22:33:18 +01:00

js

…

modules

Revert All of Cael_Aislinn's stuff from the last day, committed by Cib.

2012-06-15 22:33:18 +01:00

unused

Various fixes for bans and mutations.

2012-06-03 03:40:26 +01:00

WorkInProgress

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

2012-06-16 12:02:29 +10:00

ZAS

Revert All of Cael_Aislinn's stuff from the last day, committed by Cib.

2012-06-15 22:33:18 +01:00

names.dm

…

setup.dm

TG: Changed a bunch of constants to defines and made setup.dm all pretty and easy to

2012-06-03 17:09:44 +01: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