Cael_Aislinn 06809c3651 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	code/controllers/master_controller.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-02-01 23:45:13 +10:00

..

80x15.png

…

88x31.png

…

add-to-changelog.html

TG: - Here's a thingamabob for all you sissies who cry "What a terrible new

2012-04-22 03:00:41 +01:00

admin_pm.html

…

archivedchangelog.html

Readded Left and Right indicators to zone select. Fixes Admisn and Ninjas not being invisible. Moves some changelog bits to archived changelog, and updated credits list.

2012-06-05 04:10:05 +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 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-01 23:45:13 +10: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

…

dice.png

…

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

…

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

…

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

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

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