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

Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm

2015-09-06 13:27:51 -04: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

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

client

announce login message as a config

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

clothing

Assemblies update

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

crafting

Merge pull request #11239 from Firecage/del2qdel

2015-08-19 11:50:24 +02:00

detectivework

reagent reaction() now use more methods. Instead of just INGEST or TOUCH, we now have INGEST (for injection, ingestion), TOUCH (for splashing), PATCH (for patch application and blob attack), and VAPOR (for smoke, foam and spray application).

2015-08-09 14:23:12 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

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

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

Fixes proc arguments

2015-07-15 23:52:35 +02:00

holiday

buffs out a few of the bigger holidays celibration periods

2015-07-24 13:21:02 -04:00

html_interface

Modifications to crew monitoring computer, procqueue and html_interface.

2015-07-12 13:37:18 +02:00

hydroponics

Merge pull request #11341 from bgobandit/suicideisnotajoke

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

library

Fixes proc arguments

2015-07-15 23:52:35 +02:00

lighting

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mining

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

2015-09-06 13:27:51 -04:00

mob

Merge pull request #11564 from Jordie0608/thisbranchnameisalie

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

nano

Fixes proc arguments

2015-07-15 23:52:35 +02:00

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

Assemblies update

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

procedural mapping

Fixes proc arguments

2015-07-15 23:52:35 +02:00

projectiles

Merge pull request #11341 from bgobandit/suicideisnotajoke

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

reagents

Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

2015-09-01 15:54:18 +03: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

Actually fixed

2015-08-14 22:44:34 -05:00

shuttle

Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe

2015-07-25 19:22:46 +10:00

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