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

Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm

2014-01-23 00:05:53 -06:00

..

crates_lockers

Personnelly, I feel this pull request was successfull.

2014-01-08 19:26:10 +00:00

stool_bed_chair_nest

Fixes #3642

2013-11-24 09:22:50 +10:30

barsign.dm

…

bedsheet_bin.dm

…

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

…

false_walls.dm

…

flora.dm

Same fix again.

2013-10-21 04:48:07 +03:00

girders.dm

Girder health/laserkill fix

2013-11-23 18:50:15 -05:00

grille.dm

Fixes #4040

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

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

…

mineral_doors.dm

…

mirror.dm

…

mop_bucket.dm

…

morgue.dm

Fixes morgue trays used by ghosts and what not

2014-01-08 19:39:20 +00:00

musician.dm

…

noticeboard.dm

…

safe.dm

…

signs.dm

Adds signs pointing where department is.

2013-12-18 12:34:53 +04:00

tables_racks.dm

Fixes #4034

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

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

watercloset.dm

More typo fixes

2014-01-15 20:03:12 +13:00

windoor_assembly.dm

…

window.dm

Fixes #4040

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