xxalpha 3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2015-08-31 08:52:30 +01:00

..

admin

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

2015-08-30 22:55:53 +10:00

assembly

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

2015-08-31 08:52:30 +01:00

awaymissions

Changes a lot of del() to qdel()

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

client

interface for watchlist, improvements to memo, varedit, ban interfaces

2015-08-27 20:57:01 +10:00

clothing

fixes ablative reflect

2015-08-27 22:29:20 +02: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

…

events

Merge pull request #11356 from Aranclanos/listnull

2015-08-28 07:20:03 -05:00

flufftext

Fixes a runtime where the xeno hallucination fails to find a vent to spawn the alien.

2015-08-24 05:11:36 -03: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 remote-tracking branch 'upstream/master' into qdelFixes

2015-08-31 08:52:30 +01:00

mob

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

2015-08-31 08:52:30 +01:00

nano

Fixes proc arguments

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

ninja

Fixes ninja stealth not working at all

2015-08-20 21:44:56 -03: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 #11416 from xxalpha/airlockQDEL

2015-08-31 00:08:27 +03: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

Merge pull request #11459 from bgobandit/itsafuckingpotionfuck

2015-08-30 20:34:45 -05:00

recycling

Adds a Destroy() for the disposal pipe trunk.

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

research

Merge pull request #11459 from bgobandit/itsafuckingpotionfuck

2015-08-30 20:34:45 -05: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