PsiOmega 1784e62621 Merge remote-tracking branch 'upstream/dev' into Stripping ...

Conflicts:
	code/modules/mob/living/carbon/human/whisper.dm

2014-11-22 11:27:19 +01:00

..

admin

Merge pull request #6906 from mwerezak/faxmachine

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

assembly

Merge pull request #6942 from PsiOmegaDelta/Hacking

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

awaymissions

Merge resolution.

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

client

Merge pull request #7088 from mwerezak/skrell

2014-11-22 03:23:41 -05:00

clothing

Merge pull request #7008 from Zuhayr/spaceninjas

2014-11-22 09:30:54 +01:00

customitems

Merge resolution.

2014-11-22 07:31:44 +10:30

destilery

…

detectivework

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

2014-11-21 10:27:56 +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

Moved everything to a module-based hardsuit system.

2014-11-14 22:57:26 +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

Rewrote maploader to act faster and better handle set variables.

2014-11-15 01:33:13 +01:00

mining

Merge pull request #6963 from mwerezak/sliceable

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

mob

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

2014-11-22 11:27:19 +01:00

nano

testing fix for nui resources

2014-10-13 20:01:54 +01:00

organs

Merge resolution.

2014-11-19 23:19:33 +10:30

paperwork

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

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

power

Merge resolution.

2014-11-22 07:31:44 +10:30

projectiles

Merge pull request #7008 from Zuhayr/spaceninjas

2014-11-22 09:30:54 +01:00

reagents

Merge resolution.

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

recycling

Readded monkey dexterity checks in each attack_hand as appropriate.

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

research

Merge resolution.

2014-11-22 07:31:44 +10:30

scripting

…

security levels

Readded monkey dexterity checks in each attack_hand as appropriate.

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

shieldgen

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

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

shuttles

AI's no longer able to use specop's shuttle console.

2014-11-12 23:37:25 -05:00

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