PsiOmega 2a796f2ddd Merge remote-tracking branch 'upstream/master' into dev

2014-11-21 10:27:56 +01:00

..

area

Merge remote-tracking branch 'upstream/dev' into APC

2014-11-16 10:38:01 +01:00

dna

Removed attack_paw, attack_animal and attack_slime.

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

gamemodes

Merge pull request #6906 from mwerezak/faxmachine

2014-11-21 08:02:21 +01:00

jobs

Proper slot equipment.

2014-11-19 18:35:44 +03:00

machinery

Merge remote-tracking branch 'upstream/master' into dev

2014-11-21 10:27:56 +01:00

magic

…

mecha

MedicalHUD takes hardcrit in account

2014-11-20 18:42:17 +01:00

objects

Merge pull request #7071 from Segrain/dev

2014-11-21 08:03:24 +01:00

turfs

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

vehicles

…

verbs

…

asteroid.dm

…

atoms_movable.dm

Removed attack_paw, attack_animal and attack_slime.

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

atoms.dm

Dynamic Headset Description

2014-11-18 18:43:12 +01: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