Atlantiscze 3815ac146f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom ...

Attempt to resolve merge conflict.

2014-12-07 04:33:46 +01:00

..

area

Bed and mercenary shuttle refactoring.

2014-12-01 22:31:31 +01:00

dna

Fixes exploit that lets AIs use machinery even after cameras are disabled.

2014-11-30 15:24:39 +01:00

gamemodes

Adds image for cult talismans

2014-12-05 20:56:07 -05:00

jobs

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

machinery

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom

2014-12-07 04:33:46 +01:00

magic

…

mecha

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

objects

Merge pull request #7225 from PsiOmegaDelta/SyndiBorg

2014-12-05 23:37:31 +10:30

turfs

Reverted wall repairing with tape

2014-12-02 23:17:46 +13:00

vehicles

…

verbs

Chat tags for OOC and LOOC.

2014-11-28 11:15:53 +01:00

asteroid.dm

…

atoms_movable.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

atoms.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30