bgobandit 607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax ...

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

2015-08-28 02:54:43 -04:00

..

admin

Merge pull request #11293 from Aranclanos/watchlist

2015-08-24 14:06:18 +02: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

Hardsuit helmets will now store the suit as a var and they will qdel eachother when deleted.

2015-08-24 04:25:47 -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

…

events

Removes dirt from walking on tiles

2015-08-24 11:33:52 +03: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

…

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 #11340 from phil235/CoinFlipThrowFix

2015-08-27 01:00:01 -05:00

mob

g merge conflicts. remote-tracking branch 'upstream/master' into dronepax

2015-08-28 02:54:43 -04: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

Make it so the code doesn't rebuild (propagate_network()) the wire network X times when singulo/explosion destroys a line of X cables at once.

2015-08-25 20:22:30 +02: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 #11380 from bgobandit/salicyclicassblastusa

2015-08-27 23:53:58 -05:00

recycling

Adds a Destroy() for the disposal pipe trunk.

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

research

Fixes the admin message not appearing under certain conditions when the rapid dupe experimentator relic is used.

2015-08-25 05:31:02 -03: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