paprka ea591b26dc Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonjumpsuit ...

Conflicts:
	icons/mob/uniform.dmi

2014-10-20 19:48:27 -07:00

..

__DEFINES

Defines for the define god

2014-10-09 14:49:28 +13:00

__HELPERS

Added NOTICE() for world.log messages that aren't errors or warnings.

2014-10-14 20:06:37 -03:00

_globalvars

Fixes undershirts to play nice with female uniforms.

2014-10-11 13:09:52 -04:00

_onclick

Merge pull request #5182 from RemieRichards/XenoLeaping

2014-10-17 07:36:57 -07:00

ATMOSPHERICS

Updated maps and fixed runtime

2014-10-16 16:42:32 +02:00

controllers

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

datums

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

defines

Merge pull request #5137 from paprka/holosignoff

2014-10-10 17:41:41 +01:00

game

Merge pull request #5206 from paprka/usedcuffs

2014-10-20 19:28:10 -07:00

js

…

LINDA

…

modules

Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonjumpsuit

2014-10-20 19:48:27 -07:00

unused

…

WorkInProgress

Fix cyborg flashes being useable in flashers and cyborg heads.

2014-10-19 04:35:10 +01:00

_compile_options.dm

Edited comment and added delay to roman armor

2014-10-06 22:07:11 +04:00

hub.dm

…

world.dm

…