PsiOmega bb1ef08ab3 Merge remote-tracking branch 'upstream/master' into OutpostAirlock

2014-09-14 08:28:57 +02:00

..

area

Renames syndicate mothership area, fixes temp_factor calc

2014-09-08 22:38:52 -04:00

dna

Fixes icons and other things not updating when the master controller updates power status.

2014-08-10 03:45:20 -04:00

gamemodes

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

jobs

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

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

machinery

Merge remote-tracking branch 'upstream/master' into OutpostAirlock

2014-09-14 08:28:57 +02:00

magic

…

mecha

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2014-09-01 22:03:29 +09:30

objects

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

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

turfs

…

vehicles

…

verbs

…

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.

2014-08-19 10:50:17 +02:00

socket_talk.dm

…

sound.dm

Sound fixes

2014-07-28 14:09:16 -04:00

supplyshuttle.dm

Merge pull request #5832 from Baystation12/master

2014-07-29 18:37:19 +04:00