Jordie0608 8c26f4cb01 Merge branch 'master' of https://github.com/tgstation/-tg-station into beforecolortvalllistswereblackandwhite ...

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-08-22 16:55:13 +10:00

..

admin

adds some sane sorting to sql notes.

2015-08-19 08:36:22 -07:00

assembly

Logging Syntax Improvement

2015-08-13 12:14:14 -05:00

awaymissions

Changes a lot of del() to qdel()

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

client

autoconvert notes to sql procs

2015-08-17 15:24:50 +10:00

clothing

Merge pull request #10901 from CosmicScientist/mobcostumes

2015-08-11 18:16:49 -05: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

Preventative appendectomy prevents appendicitis

2015-08-03 15:13:00 +03:00

flufftext

Changes a lot of del() to qdel()

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

food&drinks

Logging Syntax Improvement

2015-08-13 12:14:14 -05: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

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02: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 pull request #11045 from KorPhaeron/survivalpod

2015-08-18 20:50:18 +01:00

mob

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

2015-08-22 16:55:13 +10:00

nano

Fixes proc arguments

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

ninja

Merge pull request #10957 from Core0verload/surgery-organs-implants

2015-08-04 21:45:02 +10:00

paperwork

Revert "Adds 15-force edaggers that look and function like pens when off."

2015-08-16 00:36:08 +02:00

power

Merge pull request #11258 from Anonus/spoopyghosts

2015-08-19 16:15:03 +01:00

procedural mapping

Fixes proc arguments

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

projectiles

Merge pull request #11239 from Firecage/del2qdel

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

reagents

gold core spawnable as var

2015-08-22 16:49:13 +10:00

recycling

Adds a Destroy() for the disposal pipe trunk.

2015-08-18 03:02:09 -03:00

research

Merge pull request #11239 from Firecage/del2qdel

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

scripting

Change many ERROR() calls into thrown exceptions

2015-07-23 08:19:08 -07: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 #11162 from Core0verload/rnd-implants

2015-08-18 20:20:12 +01:00

telesci

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

2015-07-19 21:53:39 +02:00