PsiOmega 02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm

2015-03-01 21:15:47 +01:00

..

area

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power

2015-02-24 13:09:05 +01:00

dna

…

gamemodes

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

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

jobs

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

2015-03-01 21:15:47 +01:00

machinery

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

2015-03-01 21:15:47 +01:00

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/dev-freeze' into dev

2015-03-01 21:15:47 +01:00

turfs

Makes starlight strength configurable.

2015-02-24 16:12:07 +01:00

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