FalseIncarnate a1cce51559 Merge Conflict Fix, Attempt 2

2015-05-27 01:07:19 -04:00

..

area

Merge pull request #1142 from tigercat2000/ambi

2015-05-23 20:57:03 -04:00

dna

HUD fixes

2015-05-26 21:13:02 -04:00

gamemodes

issmall fixes and order of operations

2015-05-25 23:50:53 -04:00

jobs

First 1/3 of port done.

2015-05-25 17:59:30 -04:00

machinery

Merge Conflict Fix, Attempt 2

2015-05-27 01:07:19 -04:00

magic

…

mecha

3/3 port done

2015-05-25 20:16:34 -04:00

objects

Merge Conflict Fix, Attempt 2

2015-05-27 01:07:19 -04:00

structure

…

turfs

3/3 port done

2015-05-25 20:16:34 -04:00

vehicles

3/3 port done

2015-05-25 20:16:34 -04:00

verbs

First 1/3 of port done.

2015-05-25 17:59:30 -04:00

asteroid.dm

…

atoms_movable.dm

2/3 of port done

2015-05-25 19:48:13 -04:00

atoms.dm

Update simulated var to bay12 refactors

2015-05-13 07:49:51 -07:00

json.dm

…

response_team.dm

Botany Fixes and Telescopic Scythes

2015-05-12 23:00:02 -04:00

shuttle_engines.dm

Add CanAtmosPass to shuttle windows

2015-04-30 19:45:48 -07:00

skincmd.dm

…

smoothwall.dm

Port -tg-'s port of /vg/'s smoothwall.

2015-05-17 07:39:53 -07:00

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

2/3 of port done

2015-05-25 19:48:13 -04:00