PsiOmega 0731badf87 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm

2014-11-30 10:54:15 +01:00

..

admin

Dead chat will get announcements when someone joins or leaves it.

2014-11-28 13:05:26 +01:00

assembly

Merge pull request #6942 from PsiOmegaDelta/Hacking

2014-11-07 03:49:38 +03:00

awaymissions

Merge resolution.

2014-11-19 23:28:09 +10:30

client

Separated pAI and posibrain candidacy, fixed their jobbans.

2014-11-29 00:31:27 +01:00

clothing

Robots can now be rebuilt after destruction.

2014-11-27 08:58:29 +01:00

customitems

Merge pull request #7089 from sabiram/dev

2014-11-23 18:08:16 +01:00

destilery

…

detectivework

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

2014-11-21 10:27:56 +01:00

economy

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

2014-11-26 22:10:09 +01:00

events

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

ext_scripts

…

flufftext

Moved everything to a module-based hardsuit system.

2014-11-14 22:57:26 +10:30

food

…

games

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

genetics

…

hydroponics

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

2014-11-24 08:58:30 +10:30

icon generation

…

library

…

liquid

…

maps

Fixes Map Loader issues.

2014-11-28 08:37:23 +01:00

mining

Merge pull request #6963 from mwerezak/sliceable

2014-11-08 11:07:34 +03:00

mob

Merge pull request #7154 from PsiOmegaDelta/SneakyPersonalAIs

2014-11-30 12:50:44 +03:00

nano

…

organs

Robots can now be rebuilt after destruction.

2014-11-27 08:58:29 +01:00

paperwork

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

2014-11-29 10:09:03 +01:00

power

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

2014-11-30 10:54:15 +01:00

projectiles

Fix most nullspace items, rewrite floor tiles not to del() on every place/remove

2014-11-24 17:05:46 +00:00

reagents

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

2014-11-25 10:33:47 +01:00

recycling

AI disposal interaction.

2014-11-22 11:46:51 +01:00

research

Robots can now be rebuilt after destruction.

2014-11-27 08:58:29 +01:00

scripting

…

security levels

Readded monkey dexterity checks in each attack_hand as appropriate.

2014-11-13 17:46:37 +10:30

shieldgen

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

2014-11-29 10:09:03 +01:00

shuttles

Nukeops shuttle docking

2014-11-29 03:51:45 +01:00

supermatter

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

surgery

…

vehicles

Fix most nullspace items, rewrite floor tiles not to del() on every place/remove

2014-11-24 17:05:46 +00:00

virus2

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30