PsiOmegaDelta 13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs ...

Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm

2015-10-10 12:05:36 +02:00

..

admin

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

2015-10-10 12:05:36 +02:00

alarm

…

assembly

…

awaymissions

…

blob

Fixes a minor blob issue, adds mecha attack message

2015-10-07 10:49:24 +03:00

client

Adds language prefix reset option.

2015-09-18 21:42:02 +02:00

clothing

Destroy tweaks.

2015-09-25 10:44:23 +02:00

customitems

…

detectivework

…

economy

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

2015-09-12 13:10:29 +02:00

events

Updates blob

2015-10-05 18:10:16 +03:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Updates blob

2015-10-05 18:10:16 +03:00

hydroponics

Xenomorph Queens can now infest victims.

2015-09-21 20:36:51 +09:30

icon generation

…

library

…

lighting

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

2015-09-18 08:51:10 +02:00

liquid

…

maps

…

materials

…

mining

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

2015-09-11 08:54:03 +02:00

mob

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

2015-10-10 12:05:36 +02:00

multiz

Turf initialization tweaking.

2015-09-27 13:18:18 +02:00

nano

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

2015-09-29 11:52:48 +02:00

organs

Updating to new dev antagonist code.

2015-09-21 20:38:19 +09:30

overmap

…

paperwork

Updates blob

2015-10-05 18:10:16 +03:00

power

Updates blob

2015-10-05 18:10:16 +03:00

projectiles

Merge pull request #11208 from mwerezak/firemode-cleanup

2015-09-28 11:41:03 +01:00

random_map

…

reagents

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

2015-10-10 12:05:36 +02:00

recycling

fix #10882

2015-09-16 14:34:20 +03:00

research

Updates mechfab

2015-10-08 16:03:32 -04:00

scripting

…

security levels

…

shieldgen

Updates blob

2015-10-05 18:10:16 +03:00

shuttles

…

spells

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

2015-09-27 13:48:33 +02:00

supermatter

…

surgery

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

tables

…

vehicles

Updates blob

2015-10-05 18:10:16 +03:00

virus2

Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.

2015-09-26 09:19:58 +02:00

xgm

…