paprka 79e2eedacb Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2014-12-27 22:26:21 -08:00

..

__DEFINES

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

2014-12-26 16:14:19 -08:00

__HELPERS

Sanity checks

2014-12-27 13:59:55 +00:00

_globalvars

…

_onclick

Fixes being able to remove clothing and inventory stuff while straightjacketed or handcuffed by clicking the inventory slot, not the worn item itself.

2014-12-14 18:03:49 +01:00

ATMOSPHERICS

Merge pull request #6207 from phil235/RecursiveHearVisibleMessage

2014-12-27 13:20:50 +01:00

controllers

Merge pull request #6490 from tkdrg/nomoreadmingrudges

2014-12-27 19:25:43 -08:00

datums

Merge pull request #6591 from phil235/FingerlessSpriteFix

2014-12-27 15:46:43 -03:00

defines

…

game

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

2014-12-27 22:26:21 -08:00

js

…

LINDA

…

modules

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

2014-12-27 22:26:21 -08:00

_compile_options.dm

…

hub.dm

…

world.dm

Reserve PascalCase inits

2014-12-16 12:29:04 +02:00