Jordie0608 3bd637b186 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() ...

Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/reagents/reagent_containers/patch.dm
	code/modules/reagents/reagent_containers/pill.dm

2015-01-19 18:28:38 +11:00

..

admin

Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess

2015-01-15 21:56:23 -08:00

assembly

Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.

2015-01-14 18:00:17 +01:00

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

Adds chemical heater nanoUI & construction/upgrade

2015-01-14 22:41:53 -03:00

clothing

bloat killer 9000

2015-01-17 16:36:27 -08:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup

2015-01-16 17:25:50 -08:00

flufftext

crossbow, speargun, and grenade updates

2015-01-13 20:00:58 -08:00

food&drinks

Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()

2015-01-19 18:28:38 +11:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08:00

library

Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.

2015-01-14 14:04:21 +01:00

mining

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

mob

Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup

2015-01-19 03:32:57 -03:00

nano

SubSystem rewrite

2014-12-31 13:25:41 +00:00

paperwork

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08:00

power

And other readibility improvement

2015-01-16 04:31:02 +03:00

projectiles

bloat killer 9000

2015-01-17 16:36:27 -08:00

reagents

Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()

2015-01-19 18:28:38 +11:00

recycling

* Prevent stacking of dense disposal constructs (bin, outlet, chute)

2015-01-15 20:05:15 +01:00

research

Merge pull request #7137 from tkdrg/heatertweak

2015-01-18 11:23:07 +01:00

scripting

Updates/fixes to NTSL

2015-01-03 17:43:43 -08:00

security levels

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

shuttle

Resolves #6953 - Shuttle transparent corners now inherit a snapshot of the turf they replace. Note: don't use them for interiors! Only external corners!.

2015-01-11 18:42:58 +00:00

surgery

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

telesci

SubSystem rewrite

2014-12-31 13:25:41 +00:00