xxalpha a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes ...

Conflicts:
	code/__DEFINES/misc.dm

2015-09-08 16:56:37 +01:00

..

admin

Merge pull request #11564 from Jordie0608/thisbranchnameisalie

2015-09-06 06:40:15 +03:00

assembly

Assemblies update

2015-09-04 11:22:37 +03:00

awaymissions

…

client

announce login message as a config

2015-09-04 21:49:09 +10:00

clothing

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

2015-09-08 16:56:37 +01:00

crafting

…

detectivework

Adds game and attack logging to rags

2015-09-08 12:39:48 +12:00

emoji

…

events

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

flufftext

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

food&drinks

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

games

…

holiday

…

html_interface

…

hydroponics

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +03:00

library

…

lighting

…

mining

Changed asteroid plating singularity pull to do nothing.

2015-09-08 15:59:35 +01:00

mob

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

2015-09-08 16:56:37 +01:00

nano

…

ninja

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

paperwork

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +03:00

power

Merge pull request #11604 from duncathan/itwaslessthan300000runtimessofranklyIammorethanokwiththis

2015-09-07 13:49:01 +01:00

procedural mapping

…

projectiles

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +03:00

reagents

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

2015-09-08 16:56:37 +01:00

recycling

Assemblies update

2015-09-04 11:22:37 +03:00

research

Merge pull request #11385 from Aranclanos/extrapug

2015-09-04 23:20:25 -05:00

scripting

/datum/stack replaces /stack, naming scheme redo for procs and linked_element --> linked_node

2015-08-28 16:52:22 +01:00

security levels

…

shuttle

…

surgery

Merge pull request #11414 from Xhuis/shadowling_update_4

2015-09-01 17:19:07 +03:00

telesci

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00