MrSnapwalk 07441e1e61 Attempting to fix conflicts with the following files: ...

icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi

2014-11-19 13:54:28 -06:00

..

admin

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

2014-11-19 23:17:48 +10:30

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

Attempting to fix conflicts with the following files:

2014-11-19 13:54:28 -06:00

customitems

Merge pull request #7054 from mwerezak/cat

2014-11-19 23:15:39 +10:30

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

…

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 resolution.

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

nano

…

organs

Merge resolution.

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

paperwork

Removed attack_paw, attack_animal and attack_slime.

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

power

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

projectiles

Readded monkey dexterity checks in each attack_hand as appropriate.

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

reagents

Merge resolution.

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

recycling

Readded monkey dexterity checks in each attack_hand as appropriate.

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

research

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

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

…

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