Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

crates_lockers

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

stool_bed_chair_nest

Grammar patch 1

2014-04-08 14:48:31 +03:00

barsign.dm

…

bedsheet_bin.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

coathanger.dm

…

displaycase.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

door_assembly.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

electricchair.dm

…

extinguisher.dm

Can no longer use fire extinguisher closet without hands

2014-03-31 18:19:25 +03:00

false_walls.dm

…

flora.dm

…

girders.dm

…

grille.dm

Kicking a grille does 2 less damage; fix for #4557

2014-04-05 19:15:41 +03:00

inflatable.dm

Missing files added.

2014-03-30 21:51:20 +08:00

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

Update lattice.dm

2014-01-18 00:16:14 +01:00

mineral_doors.dm

Fixed inexplicable reversions.

2014-02-19 17:11:09 -07:00

mirror.dm

…

mop_bucket.dm

…

morgue.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

musician.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

noticeboard.dm

…

safe.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

signs.dm

Grammar patch 1

2014-04-08 14:48:31 +03:00

tables_racks.dm

Fixes #4034

2013-12-18 11:17:17 +10:30

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

watercloset.dm

Cannot wash your missing hands anymore

2014-03-31 21:13:26 +03:00

windoor_assembly.dm

Fixed inexplicable reversions.

2014-02-19 17:11:09 -07:00

window.dm

Fixes #4689

2014-04-05 00:38:48 -04:00