xxalpha ab1227625f Merge remote-tracking branch 'upstream/master' into smoothballs ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-07-08 00:43:02 +01:00

..

admin

Merge pull request #10419 from Ikarrus/gangbadmin

2015-07-07 08:57:30 -05:00

assembly

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

awaymissions

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

client

Renames duplicate random_name() proc

2015-07-06 20:15:47 -06:00

clothing

Merge pull request #10222 from MMMiracles/freedomsocks

2015-07-04 10:04:46 +03:00

crafting

Merge pull request #10389 from Razharas/PinFix

2015-07-06 00:31:43 +01:00

detectivework

Merge from upstream.

2015-06-25 20:30:19 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

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

events

Merge pull request #10360 from Perakp/cargoVirusEvent

2015-07-07 07:42:08 -05:00

flufftext

Merge from upstream.

2015-06-25 20:30:19 +02:00

food&drinks

Merge pull request #10261 from Razharas/FridgeFix

2015-07-04 15:42:35 -05:00

games

Merge pull request #10244 from Ikarrus/workplacesafety

2015-07-03 05:05:36 +03:00

holiday

Adds a category for food items, adds some missing weapons and a Misc category

2015-06-25 11:58:42 +01:00

html_interface

Minimap support for the crew monitoring computer.

2015-06-28 23:00:39 +02:00

hydroponics

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

library

Squashed Commits

2015-06-27 00:09:16 -06:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

Merge pull request #10271 from Cheridan/red_faction

2015-07-05 00:21:58 +03:00

mob

Merge pull request #10376 from Perakp/simpleAnimalEmoteSpam

2015-07-07 20:22:31 +02:00

nano

Merge from upstream.

2015-06-25 20:30:19 +02:00

ninja

Update and Changelog

2015-07-05 22:20:00 -06:00

paperwork

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

power

Merge remote-tracking branch 'upstream/master' into boxesofbananium

2015-07-02 18:49:41 +01:00

procedural mapping

Merge from upstream.

2015-06-25 20:30:19 +02:00

projectiles

Merge pull request #10265 from Razharas/PinRemoval

2015-07-04 12:50:11 -05:00

reagents

Merge remote-tracking branch 'upstream/master' into smoothballs

2015-07-08 00:43:02 +01:00

recycling

Added sanity check to disposal climbing

2015-06-30 15:45:48 +02:00

research

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

scripting

Merge from upstream.

2015-06-25 20:30:19 +02:00

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

Merge from upstream.

2015-06-25 20:30:19 +02:00

surgery

Update and Changelog

2015-07-05 22:20:00 -06:00

telesci

Fixes telesci console icon

2015-06-26 17:03:29 +03:00