Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm

2015-06-07 14:05:54 +03:00

..

admin

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

2015-06-07 10:51:41 +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

Mostly removes creation of throwaway objects from chameleon items

2015-06-06 18:19:23 -04:00

customitems

…

detectivework

…

economy

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

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

events

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

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

examine

Updates chameleon gun help text

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

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

Fixes compilation errors.

2015-06-07 11:14:06 +02:00

mining

Refactored random map generator system and added several terrain generators.

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

mob

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

nano

Allows all synths to view the alternative law sets.

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

organs

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

2015-06-07 10:51:41 +02:00

overmap

…

paperwork

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

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

power

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade

2015-06-05 13:24:03 +03:00

projectiles

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

random_map

Refactored random map generator system and added several terrain generators.

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

reagents

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

recycling

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

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

research

NPC mobs and blobs now attack all external human limbs.

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

scripting

…

security levels

…

shieldgen

fix #9666

2015-06-04 18:46:27 +03:00

shuttles

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

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

spells

Makes file use user and not usr

2015-06-05 19:04:11 +01:00

supermatter

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

2015-06-07 10:51:41 +02:00

surgery

Additional IPC tweaks.

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

tables

…

vehicles

…

virus2

…

xgm

reorganize xgm into its own module

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