mwerezak 348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine ...

Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm

2014-11-20 14:57:35 -05:00

..

AI_Visibility

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

animusstation

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

Apples

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

Cael_Aislinn

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

carn

Tentative fix for #4037, unable to reproduce runtime to check.

2013-12-19 22:13:48 +10:30

Chinsky

Removed attack_paw, attack_animal and attack_slime.

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

Cib

Fixes #7026

2014-11-16 14:43:38 -05:00

computer3

Fixes newly-vended laptops opening windows and giving close messages

2014-11-05 17:06:01 +00:00

kilakk

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

Mini

Removed attack_paw, attack_animal and attack_slime.

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

Mloc

…

organs

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

Ported

Removed attack_paw, attack_animal and attack_slime.

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

Sigyn

No more sleeping in closets

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

SkyMarshal

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

Susan

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

Tastyfish

Cables are now stacks

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

Wrongnumber

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

autopsy.dm

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -04:00

buildmode.dm

Fixes #5088

2014-06-17 20:35:48 +01:00

explosion_particles.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

meteors.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

periodic_news.dm

Newscaster and photo cleanup

2014-11-06 13:28:17 +01:00