Steelpoint 5a5bcbbbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS ...

Conflicts:
	code/game/gamemodes/changeling/powers/mutations.dm

2015-09-10 23:18:39 +08:00

..

area

Changes a lot of del() to qdel()

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

gamemodes

Merge pull request #11612 from Iamgoofball/patch-117

2015-09-10 17:10:41 +02:00

jobs

Rifle

2015-09-10 13:14:41 +08:00

machinery

Merge pull request #11571 from xxalpha/airlocking

2015-09-08 20:49:40 +02:00

mecha

Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

2015-09-01 15:54:18 +03:00

objects

Rifle

2015-09-10 13:14:41 +08:00

pooling

Fixes proc arguments

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

turfs

Merge pull request #11585 from bgobandit/legitposters

2015-09-09 02:38:56 +03:00

verbs

database notes

2015-08-15 22:24:24 +10:00

asteroid.dm

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

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

atoms_movable.dm

I screwed up that merge

2015-08-14 21:36:35 -06:00

atoms.dm

Merge pull request #11239 from Firecage/del2qdel

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

communications.dm

Fixes proc arguments

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

data_huds.dm

Fixes proc arguments

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

dna.dm

Fixes transfer_identity() sending the wrong argument for hardset_dna(), causing some errors.

2015-08-22 07:16:28 -03:00

say.dm

no wait that's dumb

2015-08-30 18:55:58 +02:00

shuttle_engines.dm

…

skincmd.dm

Fixes proc arguments

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

sound.dm

Change many ERROR() calls into thrown exceptions

2015-07-23 08:19:08 -07:00