Zuhayr c9e948095c Thought I had done these before, turned out I did. Single-linebreak conflicts woo.

2014-10-12 11:55:33 +10:30

..

admin

Merge

2014-10-11 13:58:16 -04:00

assembly

…

awaymissions

Completes the transfer to the refreshed announcement system.

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

client

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

clothing

Merge

2014-10-11 13:58:16 -04:00

customitems

Merge

2014-10-11 13:58:16 -04: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

Merge

2014-10-11 13:58:16 -04:00

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

Thought I had done these before, turned out I did. Single-linebreak conflicts woo.

2014-10-12 11:55:33 +10:30

nano

…

organs

Merge

2014-10-11 13:58:16 -04:00

paperwork

Merge

2014-10-11 13:58:16 -04:00

power

Fixes #6644

2014-10-11 07:44:48 +10: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

Merge

2014-10-11 13:58:16 -04:00

research

Fixes #6645

2014-10-11 06:58:44 +10:30

scripting

Cleans up radio frequency numbers.

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

security levels

Merge

2014-10-11 13:58:16 -04:00

shieldgen

…

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

Merge

2014-10-11 13:58:16 -04:00

vehicles

…

virus2

Merge

2014-10-11 13:58:16 -04:00