Gamerofthegame 02d539eb99 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into working

2014-10-08 18:48:59 -04:00

..

admin

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

assembly

Ported new kinda of assemblies from TG - voice assembly.

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

awaymissions

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

client

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

2014-10-06 20:15:59 +10:30

clothing

Fixes #6609, supplements #6610

2014-10-07 15:05:41 +02:00

customitems

Adds 5 approved custom items to code

2014-09-28 21:31:24 +03:00

destilery

…

detectivework

Fixes #6592

2014-10-04 02:11:51 -04:00

economy

Option to withdraw chargecard or cash at ATM

2014-09-28 21:53:19 +02:00

events

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

ext_scripts

…

flufftext

…

food

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

games

…

genetics

…

hydroponics

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

2014-09-29 06:19:26 +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 'dev' of https://github.com/Baystation12/Baystation12 into working

2014-10-08 18:48:59 -04:00

nano

…

organs

Minor fixes for previous commit, implemented default species languages.

2014-10-07 09:51:48 +10:30

paperwork

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

2014-10-06 20:15:59 +10:30

power

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

2014-09-29 06:19:26 +09:30

projectiles

Merge pull request #6584 from Iamgoofball/patch-6

2014-10-05 10:10:50 +10:30

reagents

Merge pull request #6601 from Mloc/bs12-calert

2014-10-06 19:37:24 +10:30

recycling

Large merge resultion. Used remote for map conflicts.

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

research

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

2014-10-06 20:15:59 +10: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

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

supermatter

Adds two mwerezak's requests.

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

surgery

Bunch of minor fixes for xenomorphs and borer husks.

2014-10-07 08:54:05 +10:30

vehicles

Cables are now stacks

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

virus2

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

2014-10-02 02:39:37 +09:30