Neerti 72c9b2eb15 Resolves conflicts, cherrypicks my code.

2014-11-21 03:32:00 -05: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

All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle

2014-11-11 11:27:11 -05:00

client

Merge pull request #6987 from MagmaRam/labcoat

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

clothing

Fixed typo that broke everything

2014-11-16 03:31:22 -05:00

customitems

Merge pull request #7039 from Amunak/beaker-fix

2014-11-18 01:58:56 +03: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

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

Resolves conflicts, cherrypicks my code.

2014-11-21 03:32:00 -05:00

nano

testing fix for nui resources

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

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

corrects volume shown in description of beakers

2014-11-16 20:33:25 +01:00

recycling

Readded monkey dexterity checks in each attack_hand as appropriate.

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

research

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

2014-11-14 13:33:59 +01: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

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

Merge

2014-10-11 13:58:16 -04:00

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