PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo ...

Conflicts:
	code/modules/power/solar.dm

2014-10-24 13:32:36 +02: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

…

Cael_Aislinn

Merge branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

carn

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

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

Chinsky

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

Cib

Fixes #6647

2014-10-10 00:23:03 -04:00

computer3

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

kilakk

gives warden the ability to use faxes

2014-09-14 20:07:00 -07:00

Mini

Remote air alarm control for the isolation cells now available on the outpost.

2014-08-25 23:24:35 +02:00

Mloc

…

organs

…

Ported

Tape now does not stop anything like magical wall it used to be.

2014-08-29 00:50:33 +04:00

Sigyn

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

SkyMarshal

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07: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

Remove inline comments

2014-08-14 11:17:33 +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

…

meteors.dm

…

periodic_news.dm

Expands the use of the new announcement system.

2014-08-21 12:58:02 +02:00