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

Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml

2015-06-19 10:19:08 +02:00

..

admin

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

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

All the span-corrected dm files.

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

customitems

…

detectivework

All the span-corrected dm files.

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

economy

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

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

events

Merge pull request #9792 from Techhead0/requestConsole

2015-06-12 15:42:27 +02:00

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

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

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-06-17 09:33:34 +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-freeze' into dev

2015-06-19 10:19:08 +02:00

nano

All the span-corrected dm files.

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

organs

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

2015-06-16 10:52:33 +02:00

overmap

…

paperwork

All the span-corrected dm files.

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

power

Compilation fixes.

2015-06-16 11:03:25 +02:00

projectiles

All the span-corrected dm files.

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

random_map

Refactored random map generator system and added several terrain generators.

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

reagents

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

2015-06-19 10:19:08 +02:00

recycling

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

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

research

Merge pull request #9792 from Techhead0/requestConsole

2015-06-12 15:42:27 +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

All the span-corrected dm files.

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

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

Ports /tg/'s meteor implementation.

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

virus2

…

xgm

reorganize xgm into its own module

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