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

No more sleeping in closets

2014-11-11 11:07:05 +01:00

effects

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

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

items

Merge pull request #7013 from Raptor1628/dev

2014-11-14 11:18:50 +03:00

random

Cables are now stacks

2014-08-25 18:54:35 +04:00

structures

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

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

empulse.dm

…

explosion_recursive.dm

Explosion Optimizations

2014-01-08 19:21:47 +00:00

explosion.dm

3d Sound from /tg/

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

items.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

objs.dm

AI and Topic fixes.

2014-11-07 11:10:32 +01:00

structures.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

weapons.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00