MagmaRam cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat ...

Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.

2014-11-16 02:56:32 -05:00

..

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

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

jobs

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

2014-11-16 02:56:32 -05:00

machinery

Merge pull request #7028 from PsiOmegaDelta/Portable

2014-11-16 10:15:01 +03:00

magic

…

mecha

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

objects

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

2014-11-16 02:56:32 -05: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

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

Sound fixes

2014-07-28 14:09:16 -04:00

supplyshuttle.dm

Removed attack_paw, attack_animal and attack_slime.

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