PsiOmegaDelta bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors ...

Conflicts:
	code/game/gamemodes/meteor/meteors.dm

2015-06-05 14:59:52 +02:00

..

admin

Merge remote-tracking branch 'upstream/dev' into 150605-Meteors

2015-06-05 14:59:52 +02:00

alarm

…

assembly

…

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

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

customitems

…

detectivework

…

economy

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

2015-06-04 08:10:49 +02:00

events

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Adds ghost click to posibrains.

2015-05-25 16:49:22 +09:30

holodeck

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

hydroponics

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

2015-06-04 08:20:00 +02:00

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-06-01 09:07:03 +02:00

mining

Refactored random map generator system and added several terrain generators.

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

mob

Merge remote-tracking branch 'upstream/dev' into 150605-Meteors

2015-06-05 14:59:52 +02:00

nano

Allows all synths to view the alternative law sets.

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

organs

Axed couple unused organ flags, made them look a bit nicer with bitmove

2015-06-05 11:18:07 +03:00

overmap

…

paperwork

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

2015-05-30 16:11:57 +02:00

power

Merge remote-tracking branch 'upstream/dev' into 150605-Meteors

2015-06-05 14:59:52 +02:00

projectiles

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

random_map

Refactored random map generator system and added several terrain generators.

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

reagents

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

recycling

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

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

research

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

scripting

…

security levels

…

shieldgen

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

shuttles

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

2015-05-30 15:59:54 +02:00

spells

Changes teleportation scroll and spellbook to be only usable by wizards

2015-06-04 20:21:31 +01:00

supermatter

Merge pull request #9408 from mwerezak/sm-eject

2015-05-28 11:35:39 +09:30

surgery

Additional IPC tweaks.

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

tables

Fixes IV stands blocking bullets

2015-05-26 23:05:38 -04:00

vehicles

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +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