PsiOmegaDelta b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/antagonist/outsider/ert.dm

2015-11-06 17:50:34 +01:00

..

admin

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

2015-10-16 13:02:59 +02:00

alarm

…

assembly

…

awaymissions

…

blob

Fixes a minor blob issue, adds mecha attack message

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

client

Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup

2015-10-26 05:44:13 +03:00

clothing

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

customitems

…

detectivework

…

economy

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

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

events

Blobs locations are now more random.

2015-10-13 18:49:55 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

hydroponics

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

icon generation

…

library

…

lighting

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

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

liquid

…

maps

…

materials

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

2015-10-14 08:41:38 +02:00

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-freeze' into dev

2015-11-06 17:50:34 +01:00

multiz

Turf initialization tweaking.

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

nano

Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup

2015-10-26 05:44:13 +03:00

organs

Merge pull request #11204 from Hubblenaut/medical

2015-10-19 16:17:16 +02:00

overmap

…

paperwork

Updates blob

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

power

Map cleanup, tweaks and merge fixes.

2015-11-02 10:05:14 +01:00

projectiles

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

random_map

…

reagents

Compilation fixes.

2015-10-27 13:43:30 +01:00

recycling

fix #10882

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

research

Merge pull request #11220 from caelaislinn/new_xenoarch_sprites

2015-11-03 11:14:03 +01:00

scripting

…

security levels

…

shieldgen

Updates blob

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

shuttles

…

spells

Reduces wizard subjugate duration

2015-10-27 15:14:40 -05:00

supermatter

…

surgery

Merge pull request #11230 from PsiOmegaDelta/xenomorphs

2015-10-13 08:31:27 +10: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

…