PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-04-08 10:40:38 +02:00

..

area

Attempts to fix persistent station alarms. Makes wardrobes solid.

2015-03-09 20:55:05 +01:00

dna

…

gamemodes

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-04-08 10:40:38 +02:00

jobs

Fixes #8519

2015-03-18 09:06:01 -05:00

machinery

Merge pull request #8767 from RavingManiac/dev-freeze

2015-04-08 03:23:40 +03:00

magic

…

mecha

Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled.

2015-03-10 02:47:54 -04:00

objects

Minor fixes to supermatter manual text

2015-04-05 22:40:19 +10:00

turfs

Merged with dev.

2015-02-24 17:03:39 +10:30

vehicles

…

verbs

…

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Examine tab modularity

2015-03-09 12:09:18 -04:00

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00