ZomgPonies ebfa0a0fd2 Merge branch 'pr/2' ...

Conflicts:
	baystation12.dme
	config/example/dbconfig.txt

2013-08-17 15:22:49 -04:00

..

area

Fix for power alarms cameras.

2013-08-04 01:05:50 +03:00

gamemodes

Merge pull request #3503 from Mloc/master

2013-08-13 05:20:35 -07:00

jobs

Merge branch 'pr/2'

2013-08-17 15:22:49 -04:00

machinery

Merge branch 'pr/2'

2013-08-17 15:22:49 -04:00

magic

…

mecha

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2013-08-04 01:40:32 +04:00

objects

Engineering merge.

2013-08-14 20:00:38 -07:00

structure

New decorative object

2013-08-11 02:49:02 -04:00

turfs

Merge branch 'bleeding-edge-freeze' into viro

2013-07-09 12:49:23 +04:00

vehicles

…

verbs

Fixes #3225. Adds separate toggle for LOOC.

2013-07-10 22:39:27 +04:00

asteroid.dm

…

atoms_movable.dm

Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)

2013-06-10 22:35:01 -07:00

atoms.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

communications.dm

Adds colored department radio channels.

2013-07-30 17:38:34 -04:00

dna.dm

Compile fixes, blah.

2013-08-07 11:19:31 -07:00

hud.dm

…

json.dm

…

response_team.dm

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

2013-08-07 00:25:53 -07:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Fix for ordering hidden supplypacks.

2013-06-09 10:25:27 +03:00