MagmaRam cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat ...

Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.

2014-11-16 02:56:32 -05:00

..

closets

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat

2014-11-16 02:56:32 -05:00

closets.dm

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

crates.dm

Stack update

2014-09-02 09:59:32 +04:00

largecrate.dm

Hoverpod tweaks

2014-10-26 13:16:30 -04:00