Neerti dd6f54ed47 fun fact: This took 6 hours because bay uses different say(). ...

fun fact: I'm never porting say-related stuff from bay.

Conflicts:
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/radio/headset.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/silicon/ai/ai.dm

2014-07-16 09:27:12 -04:00

..

admin

Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!

2014-07-16 00:53:08 -04:00

assembly

HurrDurr

2014-05-30 22:29:11 -04:00

awaymissions

Cleaning out old unused code.

2014-07-13 08:10:44 -04:00

client

Added NT Recruiter and Sec Pod Pilot karma jobs

2014-07-13 22:34:06 -04:00

clothing

Fixes webbing and holsters shielding EMP

2014-07-15 07:34:33 -04:00

customitems

Removed a lot of the useless testing and error logging from the runtime log.

2014-06-16 23:01:41 -04:00

destilery

…

detectivework

…

DetectiveWork

…

economy

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00

events

Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!

2014-07-16 00:53:08 -04:00

ext_scripts

…

flufftext

…

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-13 09:07:36 -04:00

genetics

Fixes #236

2014-07-14 19:24:09 +01:00

genetics2

…

hydroponics

…

icon generation

…

library

…

liquid

…

maps

…

media

Moar trying to get the lobby jukebox working.

2014-06-25 07:04:58 -04:00

mining

Fixes #5608

2014-07-14 03:25:02 -04:00

mob

fun fact: This took 6 hours because bay uses different say().

2014-07-16 09:27:12 -04:00

nano

Layout update for NanoUI.

2014-07-15 07:30:37 -04:00

organs

Fixes #5485

2014-07-14 03:31:51 -04:00

paperwork

Gives the AI a hud

2014-07-13 15:20:08 -04:00

power

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00

projectiles

Slime update

2014-07-15 00:50:41 -04:00

reagents

Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!

2014-07-16 00:53:08 -04:00

recycling

Adds supply shuttle docking controllers

2014-06-19 10:13:48 -04:00

research

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00

scripting

…

security levels

…

shuttles

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00

store

…

supermatter

Fuck Phoron

2014-07-13 07:31:09 -04:00

surgery

Slime update

2014-07-15 00:50:41 -04:00

vehicles

Moar work on janicart overhaul

2014-07-13 15:52:59 -04:00

virus2

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00