Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01: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

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

88x31.png

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

AddToChangelog.exe

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

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

admin_pm.html

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

archivedchangelog.html

Changelog updated and archived.

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

bug-minus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

burn-exclamation.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

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 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-09-02 23:32:33 +01:00

changelog.js

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

chevron-expand.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

chevron.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

create_object.html

Whoops!

2012-04-30 20:25:45 +02:00

cross-circle.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

dice20.png

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

dice.png

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

hard-hat-exclamation.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

help.html

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

image-minus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

image-plus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

map.png

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

music-minus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

music-plus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

old_add-to-changelog.html

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

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

paigrid.png

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

panels.css

Removed the infra_sensor define for noddie.

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

postcardsmall.jpg

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

search.js

Removed the infra_sensor define for noddie.

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

somerights20.png

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

spell-check.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

tg-notif.png

additional mergefixes, including tg map updates

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

tick-circle.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

wrench-screwdriver.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00