PsiOmega 7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm

2015-02-27 09:06:48 +01:00

..

area

Alarm centralization completion

2015-02-23 15:11:13 +01:00

dna

…

gamemodes

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

2015-02-27 09:06:48 +01:00

jobs

Dev merge.

2015-02-21 19:49:47 +10:30

machinery

Merge pull request #8288 from mwerezak/topicfix

2015-02-26 16:28:56 +10:30

magic

…

mecha

Allows exosuits to interface with adjacent airlock controllers and buttons.

2015-02-21 20:54:01 -05:00

objects

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

2015-02-27 09:06:48 +01:00

turfs

Merged with dev.

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

vehicles

…

verbs

…

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.

2015-02-20 08:04:17 -05: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