Atlantiscze cbeff523ac Attempt to resolve merge conflict. I hope i won't break something.

2014-09-12 20:07:21 +02:00

..

admin

Gives filters proper names, updates airlocks to use filters

2014-08-15 20:27:00 -04:00

assembly

Ported new kinda of assemblies from TG - voice assembly.

2014-08-29 04:42:20 +04:00

awaymissions

Updates eng rig path, adds obj sprites

2014-07-19 23:18:32 -04:00

client

Update preferences.dm

2014-08-27 20:56:05 +09:30

clothing

Non-drone silicons now have access to a basic security xor medical hud.

2014-08-28 20:01:43 +02:00

customitems

Adds the Cybernetic Casings custom item.

2014-08-30 18:53:04 -05:00

destilery

…

detectivework

Fixed copypaste derp resulting in runtime when you are naked sans gloves.

2014-08-27 03:41:11 +04:00

economy

Announcement system refactoring.

2014-08-21 06:34:41 +02:00

events

Various grammar and spelling fixes in ion laws

2014-08-24 23:40:25 +01:00

ext_scripts

…

flufftext

integrate XGM into the code

2014-07-22 19:52:12 +01:00

food

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

2014-07-10 22:20:13 +01:00

games

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

genetics

…

hydroponics

Fixed #5912

2014-08-10 16:29:09 -04:00

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

liquid

…

maps

…

mining

Cables are now stacks

2014-08-25 18:54:35 +04:00

mob

Merge pull request #6212 from comma/typing

2014-08-29 22:44:37 -05:00

nano

NanoUI updates.

2014-07-21 22:32:45 +01:00

organs

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

paperwork

Master to dev merge.

2014-08-27 20:24:07 +09:30

power

Attempt to resolve merge conflict. I hope i won't break something.

2014-09-12 20:07:21 +02:00

projectiles

Cables are now stacks

2014-08-25 18:54:35 +04:00

reagents

Master to dev merge.

2014-08-27 20:24:07 +09:30

recycling

Added trim to text inputs

2014-08-27 17:52:29 -07:00

research

SMES Board design fix

2014-09-02 15:18:14 +02:00

scripting

…

security levels

Expands the use of the new announcement system.

2014-08-21 12:58:02 +02:00

shieldgen

Cables are now stacks

2014-08-25 18:54:35 +04:00

shuttles

Master to dev merge.

2014-08-27 20:24:07 +09:30

supermatter

Master to dev merge.

2014-08-11 17:23:40 +09:30

surgery

Master to dev merge.

2014-08-27 20:24:07 +09:30

vehicles

Cables are now stacks

2014-08-25 18:54:35 +04:00

virus2

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

2014-07-16 19:30:41 +09:30