Zuhayr 2b4cd94650 Merge resolution.

2014-11-19 23:28:09 +10:30

..

area

Silent Alarms

2014-11-14 15:11:27 +01:00

dna

Removed attack_paw, attack_animal and attack_slime.

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

gamemodes

Merge resolution.

2014-11-19 23:28:09 +10:30

jobs

Merge pull request #6987 from MagmaRam/labcoat

2014-11-17 04:17:16 +03:00

machinery

Merge resolution.

2014-11-19 23:28:09 +10:30

magic

…

mecha

Manual merge of head.dmi.

2014-11-14 23:02:16 +10:30

objects

Merge resolution.

2014-11-19 23:28:09 +10:30

turfs

Added jetpack, added gear, fleshed out ERT hardsuits.

2014-11-15 17:39:44 +10:30

vehicles

…

verbs

Ports verb-optimizations from /tg/

2014-11-05 08:52:56 +01:00

asteroid.dm

…

atoms_movable.dm

Removed attack_paw, attack_animal and attack_slime.

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

atoms.dm

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

json.dm

…

response_team.dm

Merge pull request #6075 from MrSnapwalk/ertv3

2014-08-22 05:01:02 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.

2014-08-19 10:50:17 +02:00

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Removed attack_paw, attack_animal and attack_slime.

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