Chinsky 43ee395c48 Merge pull request #7013 from Raptor1628/dev ...

ERT Update

2014-11-14 11:18:50 +03:00

..

admin

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

2014-11-08 10:26:45 +01:00

assembly

Merge pull request #6942 from PsiOmegaDelta/Hacking

2014-11-07 03:49:38 +03:00

awaymissions

…

client

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

clothing

Merge pull request #7013 from Raptor1628/dev

2014-11-14 11:18:50 +03:00

customitems

Adds Bromuzl's custom item to item_defines.dm.

2014-11-10 19:51:08 -06:00

destilery

…

detectivework

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

economy

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

events

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

ext_scripts

…

flufftext

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

food

…

games

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

genetics

…

hydroponics

Removed attack_paw, attack_animal and attack_slime.

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

icon generation

…

library

…

liquid

…

maps

…

mining

Merge pull request #6963 from mwerezak/sliceable

2014-11-08 11:07:34 +03:00

mob

Merge pull request #7015 from Zuhayr/attackverbremoval

2014-11-14 11:18:43 +03:00

nano

…

organs

Cleans up human stance code

2014-11-12 22:56:55 -05:00

paperwork

Removed attack_paw, attack_animal and attack_slime.

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

power

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

projectiles

Readded monkey dexterity checks in each attack_hand as appropriate.

2014-11-13 17:46:37 +10:30

reagents

Merge pull request #7013 from Raptor1628/dev

2014-11-14 11:18:50 +03:00

recycling

Readded monkey dexterity checks in each attack_hand as appropriate.

2014-11-13 17:46:37 +10:30

research

Merge pull request #7015 from Zuhayr/attackverbremoval

2014-11-14 11:18:43 +03:00

scripting

…

security levels

Readded monkey dexterity checks in each attack_hand as appropriate.

2014-11-13 17:46:37 +10:30

shieldgen

Removed attack_paw, attack_animal and attack_slime.

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

shuttles

…

supermatter

Removed attack_paw, attack_animal and attack_slime.

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

surgery

…

vehicles

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

virus2

Removed attack_paw, attack_animal and attack_slime.

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