palpatine213 00f01159b1 Fixes Merge conflicts

2015-09-01 19:46:30 -07:00

..

area

Changes a lot of del() to qdel()

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

gamemodes

Merge pull request #11479 from AnturK/morefixes

2015-09-01 12:01:12 -05:00

jobs

Fixes it so that ling team objectives are correctly handed out and correctly find targets.

2015-08-15 16:58:28 +01:00

machinery

Merge pull request #11514 from bgobandit/boopbot

2015-09-01 18:30:29 +03:00

mecha

Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

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

objects

Fixes Merge conflicts

2015-09-01 19:46:30 -07:00

pooling

…

turfs

Merge pull request #11480 from spasticVerbalizer/reinforceCheck

2015-09-01 12:22:35 -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

…

data_huds.dm

…

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

…

sound.dm

Change many ERROR() calls into thrown exceptions

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