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

..

__HELPERS

Merge pull request #6983 from PsiOmegaDelta/Event

2014-11-12 23:45:02 +03:00

_onclick

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

ATMOSPHERICS

Merge resolution.

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

controllers

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

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

datums

Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else.

2014-11-11 12:47:02 -05:00

defines

Security Records Check

2014-11-15 20:10:53 +01:00

FEA

…

game

Merge pull request #7065 from Zuhayr/combitool

2014-11-19 08:37:15 -05:00

js

…

modules

Attempting to fix conflicts with the following files:

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

TriDimension

Removed attack_paw, attack_animal and attack_slime.

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

unused

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

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

WorkInProgress

Merge resolution.

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

ZAS

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

2014-10-15 22:13:44 +01:00

global.dm

Adds cyborg-only latejoin spawnpoint

2014-11-14 23:38:09 +00:00

hub.dm

…

names.dm

…

setup.dm

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

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

stylesheet.dm

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

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

world.dm

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

2014-10-15 10:05:50 +10:30