Rob Nelson 50b2fb0f4a Merge branch 'master' into Bleeding-Edge ...

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

2013-11-11 20:41:26 -08:00

..

__HELPERS

Log admonghoast shit.

2013-11-09 12:04:51 -08:00

_onclick

Updated slime code from /tg/.

2013-11-05 04:00:52 -08:00

ATMOSPHERICS

Fix cooling system

2013-10-11 00:25:59 -07:00

controllers

Log admonghoast shit.

2013-11-09 12:04:51 -08:00

datums

NanoUI APC

2013-11-10 21:55:48 -06:00

defines

Some new words.

2013-11-08 10:02:08 -08:00

FEA

Cleanup blob mode notices.

2013-09-10 17:51:12 -07:00

game

TELESCIIIIEEEEENCE

2013-11-11 19:16:52 -08:00

js

…

modules

Merge branch 'master' into Bleeding-Edge

2013-11-11 20:41:26 -08:00

TriDimension

Make icon paths absolute.

2013-09-24 20:06:18 -07:00

unused

adds hidden fingerprint logging on shit for AI's and robutts tired of not knowing who fucked with the atmos alarm or flooded plasma

2013-08-27 22:39:40 -05:00

WorkInProgress

Added fax machine to IAA office, conference room, and captain's room.

2013-11-03 22:48:18 -08:00

ZAS

Hopefully fix plasma overlays not updating all the time

2013-10-11 14:32:50 -05:00

global.dm

Added NanoUI from bay, hit string limit, ran string combiner again.

2013-09-24 19:46:45 -07:00

hub.dm

…

names.dm

…

setup.dm

Fixes AI being able to see the Deathsquad camera net

2013-10-08 13:50:21 -05:00

stylesheet.dm

Add channel for MoMMIs.

2013-09-12 18:19:24 -07:00

world.dm

Fix whitelist.

2013-11-10 04:02:54 -08:00