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

Conflicts:
	code/modules/admin/topic.dm

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

..

admin

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

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

assembly

…

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

…

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

…

games

…

holiday

…

html_interface

…

hydroponics

Changes a lot of del() to qdel()

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

library

…

lighting

…

mining

Merge pull request #11340 from phil235/CoinFlipThrowFix

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

mob

Merge pull request #11455 from Ergovisavi/gang_hires_a_cleaner

2015-08-30 17:51:57 +10:00

nano

…

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

Prevents emitters and field gens from being wrenched to the floor in space

2015-08-28 13:33:31 +02:00

procedural mapping

…

projectiles

Merge pull request #11239 from Firecage/del2qdel

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

reagents

Removes the src = null lines from chemistry code, it comes from way back, goons r4407 and its really not needed anymore.

2015-08-28 17:51:06 -03: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

…

security levels

Actually fixed

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

shuttle

…

surgery

Merge pull request #11162 from Core0verload/rnd-implants

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

telesci

…