GinjaNinja32 4b5899fa30 Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct ...

Corrects two ex_acts.

2015-06-21 13:16:23 +01:00

..

admin

Merge with dev-freeze.

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

alarm

…

assembly

…

awaymissions

…

client

…

clothing

Merge pull request #9795 from hockeygoalie5/iaasuit

2015-06-21 13:24:13 +09:30

customitems

…

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 with dev-freeze.

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

examine

…

ext_scripts

Merge pull request #9857 from GinjaNinja32/bot

2015-06-18 13:46:50 -04:00

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Fixes tiny oversight in ghost trap datum. GG global vars.

2015-06-11 08:38:32 +09:30

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-06-16 10:52:33 +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

…

liquid

…

maps

…

materials

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

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

mining

Merge with dev-freeze.

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

mob

Merge with dev-freeze.

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

nano

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

organs

Fixes #9836

2015-06-20 21:43:54 +09:30

overmap

…

paperwork

Merge with dev-freeze.

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

power

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

projectiles

Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct

2015-06-21 13:16:23 +01:00

random_map

…

reagents

Merge with dev-freeze.

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

recycling

…

research

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

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

scripting

…

security levels

…

shieldgen

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

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

shuttles

Merge with dev-freeze.

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

spells

Merge with dev-freeze.

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

supermatter

…

surgery

…

tables

Makes standard tables plastic

2015-06-14 13:38:56 -04:00

vehicles

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

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

virus2

…

xgm

…