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

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

..

admin

Readded transform procs for xenos.

2014-09-30 16:07:47 +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 branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

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

clothing

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

2014-09-30 23:23:05 +09:30

customitems

Adds 5 approved custom items to code

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

destilery

…

detectivework

Large merge resultion. Used remote for map conflicts.

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

economy

Option to withdraw chargecard or cash at ATM

2014-09-28 21:53:19 +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

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 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev

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

nano

…

organs

Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks.

2014-09-30 14:09:41 +09:30

paperwork

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

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

power

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

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

projectiles

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

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

reagents

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

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

recycling

Large merge resultion. Used remote for map conflicts.

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

research

Merg resolution.

2014-10-02 02:33:06 +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

Merg resolution.

2014-10-02 02:33:06 +09:30

supermatter

Adds two mwerezak's requests.

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

surgery

Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks.

2014-09-30 14:09:41 +09: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