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

2014-09-29 00:39:43 +09:30

..

admin

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

assembly

Ported new kinda of assemblies from TG - voice assembly.

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

awaymissions

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

client

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

clothing

Added helm for use in events and other things

2014-09-26 17:30:41 +01:00

customitems

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

destilery

…

detectivework

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

economy

Announcement system refactoring.

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

events

Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency.

2014-09-18 21:41:54 +09:30

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

hydroponics

Fixes #6297

2014-09-25 21:49:20 +09:30

icon generation

…

library

Fix for non-cancelable book removal from bookshelves

2014-09-21 16:04:22 +01:00

liquid

…

maps

…

mining

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

mob

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

2014-09-29 00:39:43 +09:30

nano

…

organs

Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes.

2014-09-25 20:07:11 +09:30

paperwork

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

power

Merge pull request #6428 from atlantiscze/cyborg-power

2014-09-25 00:19:13 +04:00

projectiles

Stack update

2014-09-02 09:59:32 +04:00

reagents

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

recycling

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

research

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

scripting

Cleans up radio frequency numbers.

2014-09-18 13:07:34 +02:00

security levels

Expands the use of the new announcement system.

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

shieldgen

Stack update

2014-09-02 09:59:32 +04:00

shuttles

Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +09:30

supermatter

Adds two mwerezak's requests.

2014-09-18 19:23:00 +02:00

surgery

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

vehicles

Cables are now stacks

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

virus2

…