PsiOmegaDelta c30a518221 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower ...

Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm

2015-12-02 09:18:07 +01:00

..

admin

Merge pull request #11502 from PsiOmegaDelta/151121-InWorldParams

2015-12-02 09:56:28 +10:30

alarm

…

assembly

…

awaymissions

…

blob

…

client

Added boot knives and putting a knife in your boot.

2015-12-01 02:05:29 +10:30

clothing

Added boot knives and putting a knife in your boot.

2015-12-01 02:05:29 +10:30

customitems

…

detectivework

…

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Merge pull request #11516 from Baystation12/dev-freeze

2015-11-24 14:35:56 +01:00

icon generation

…

library

…

lighting

Re-adds missing lighting initializer.

2015-11-21 16:20:04 +01:00

liquid

…

maps

…

materials

…

mining

Tweaks to the previous commits.

2015-12-01 02:14:47 +10:30

mob

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-02 09:18:07 +01:00

multiz

…

nano

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-02 09:18:07 +01:00

organs

…

overmap

…

paperwork

Removed uneceserry variable

2015-11-22 13:23:45 +02:00

power

Merge pull request #11451 from Loganbacca/wireless

2015-11-27 07:59:59 +01:00

projectiles

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

2015-11-22 19:45:55 +10:30

random_map

…

reagents

Mops can now be wet in buckets or sinks.

2015-12-01 02:05:27 +10:30

recycling

…

research

Merge pull request #10172 from LightningIron/mecha

2015-12-02 09:55:19 +10:30

scripting

…

security levels

…

shieldgen

…

shuttles

Merge pull request #11516 from Baystation12/dev-freeze

2015-11-24 14:35:56 +01:00

spells

…

supermatter

…

surgery

…

tables

…

vehicles

…

virus2

…

wireless

Wireless controller cleanup

2015-11-25 21:14:38 +13:00

xgm

…