Zuhayr 48cf00ca54 Merge with dev-freeze.

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

..

admin

Merge with dev-freeze.

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

alarm

…

assembly

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

awaymissions

…

client

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03:00

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

Updates chameleon gun help text

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

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

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

random_map

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

reagents

Merge with dev-freeze.

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

recycling

Now when welding sorting pipe, game update it's name

2015-06-04 20:48:57 +03:00

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

Merge pull request #9694 from PsiOmegaDelta/150605-Meteors

2015-06-08 14:17:57 +03:00

surgery

Additional IPC tweaks.

2015-05-31 02:30:57 +09:30

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

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30

xgm

reorganize xgm into its own module

2015-06-02 16:29:23 +01:00