Chinsky 7a66e7e524 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm

2013-01-22 23:46:42 +04:00

..

appendix.dm

Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.

2013-01-13 11:56:33 +04:00

bones.dm

Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.

2013-01-13 11:56:33 +04:00

braincore.dm

Merge branch 'master' into surgery

2013-01-15 13:42:13 +04:00

eye.dm

Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.

2013-01-13 11:56:33 +04:00

face.dm

Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.

2013-01-13 11:56:33 +04:00

generic.dm

Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.

2013-01-13 11:56:33 +04:00

other.dm

Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.

2013-01-13 11:56:33 +04:00

ribcage.dm

Merge branch 'master' into surgery

2013-01-15 13:42:13 +04:00

robolimbs.dm

Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.

2013-01-13 11:56:33 +04:00

surgery.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

2013-01-22 23:46:42 +04:00