Chinsky 29ea7f0d3a Merge branch 'dev-freeze' into dev ...

Conflicts:
	html/changelog.html
	maps/tgstation2.dmm

2013-10-10 14:37:41 +04:00

..

browser

Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

2013-08-31 20:12:19 +01:00

80x15.png

…

88x31.png

…

AddToChangelog.exe

Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog.

2013-08-31 19:10:02 +01:00

admin_pm.html

…

archivedchangelog.html

Changelog updated and archived.

2013-05-25 22:15:42 +01:00

bug-minus.png

…

burn-exclamation.png

…

changelog.css

updated changelog, added new TG notif type to show tg ports

2012-10-09 23:15:28 +10:00

changelog.html

Merge branch 'dev-freeze' into dev

2013-10-10 14:37:41 +04:00

changelog.js

…

chevron-expand.png

…

chevron.png

…

create_object.html

…

cross-circle.png

…

dice20.png

…

dice.png

…

hard-hat-exclamation.png

…

help.html

…

image-minus.png

…

image-plus.png

…

map.png

…

music-minus.png

…

music-plus.png

…

old_add-to-changelog.html

Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog.

2013-08-31 19:10:02 +01:00

paigrid.png

…

panels.css

Removed the infra_sensor define for noddie.

2012-11-15 20:35:37 +00:00

postcardsmall.jpg

…

search.js

Removed the infra_sensor define for noddie.

2012-11-15 20:35:37 +00:00

somerights20.png

…

spell-check.png

…

tg-notif.png

additional mergefixes, including tg map updates

2012-10-09 23:22:51 +10:00

tick-circle.png

…

wrench-screwdriver.png

…