Rob Nelson ad083fb79c Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge ...

Conflicts:
	code/game/objects/items/weapons/manuals.dm

2015-03-03 11:46:29 -08:00

..

area

Fix #2906

2015-02-17 12:08:35 -06:00

dna

machinery frames are now able to be deanchored and moved.

2015-02-27 14:43:52 -06:00

gamemodes

Merge pull request #3240 from clusterfack/Fix

2015-02-26 18:32:17 -06:00

jobs

Access tweaks

2015-02-28 00:13:09 -06:00

machinery

Remove tequilla!

2015-03-02 19:44:51 +02:00

magic

…

mecha

I'm a dumb as you could already turn roid into plating with just floor tiles, so lattice is for roid that has been dug into.

2015-02-27 03:38:29 -06:00

objects

Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge

2015-03-03 11:46:29 -08:00

structure

…

turfs

Change magic numbers to defines for the catwalk/lattice/plating building.

2015-02-27 12:41:18 -06:00

vehicles

Pipe unification and type switching

2015-02-18 21:36:36 +00:00

verbs

…

asteroid.dm

…

atoms_movable.dm

Fix the deletion profiling again.

2015-02-22 13:32:32 -06:00

atoms.dm

Removes the STOPSPRESSUREDMG flag.

2015-02-16 11:18:30 +00:00

centcomm_orders.dm

…

communications.dm

…

data_huds.dm

…

hud.dm

…

json.dm

…

response_team.dm

…

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Dorf work

2015-02-28 14:35:30 -06:00