PsiOmegaDelta 1b7ab38e79 There was a DMI name change evidently.

2015-07-20 08:35:43 +02:00

..

admin

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

2015-07-17 23:19:34 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-07-14 08:21:12 +02:00

clothing

Merge with dev.

2015-07-15 16:20:39 +09:30

customitems

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

detectivework

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

economy

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

2015-06-20 20:40:06 +02:00

events

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

2015-07-14 08:21:12 +02:00

examine

Updates chameleon gun help text

2015-06-06 23:26:56 -04:00

ext_scripts

(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly

2015-06-28 11:43:53 +01:00

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

hydroponics

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

2015-07-09 08:45:49 +02:00

icon generation

…

library

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

lighting

optimize apply/remove_lum

2015-07-12 15:47:17 +01:00

liquid

…

maps

…

materials

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

2015-07-09 08:45:49 +02:00

mining

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

2015-07-14 08:21:12 +02:00

mob

There was a DMI name change evidently.

2015-07-20 08:35:43 +02:00

nano

Compilation fixes.

2015-07-17 23:21:59 +02:00

organs

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

2015-07-11 10:58:49 +02:00

overmap

…

paperwork

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

2015-06-26 20:28:47 +02:00

power

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

2015-07-20 08:28:32 +02:00

projectiles

Merge with dev.

2015-07-15 16:20:39 +09:30

random_map

…

reagents

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

2015-07-20 08:28:32 +02:00

recycling

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

2015-07-11 09:51:24 +02:00

research

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

2015-07-20 08:28:32 +02:00

scripting

…

security levels

…

shieldgen

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

2015-07-06 18:33:09 +02:00

shuttles

Merge with dev.

2015-07-15 16:20:39 +09:30

spells

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

supermatter

Merge with dev-freeze.

2015-07-02 19:04:01 +09:30

surgery

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

2015-06-26 20:28:47 +02:00

tables

Fixes #8161

2015-07-15 16:34:05 +03:00

vehicles

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

2015-07-11 10:58:49 +02:00

virus2

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

2015-07-11 10:58:49 +02:00

xgm

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

2015-06-26 20:28:47 +02:00