Shadowlight213 9112e71914 Fixes merge conflicts

2016-07-22 01:04:45 -07:00

..

effects

Sigil nerfs (#19380)

2016-07-20 20:14:23 +12:00

items

Fixes merge conflicts

2016-07-22 01:04:45 -07:00

structures

Mjor: Creator of Original Assets (#19410)

2016-07-22 11:01:07 +12:00

buckling.dm

Fixes infinite buckling, removes unnecessary list init.

2016-06-12 14:35:14 +01:00

empulse.dm

t&a

2016-04-20 16:38:55 -04:00

explosion.dm

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

2016-04-03 18:22:20 -06:00

items.dm

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

objs.dm

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

radiation.dm

Removes rad pulse admin notice

2015-12-10 04:26:56 -06:00

structures.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

weapons.dm

Fixes proc arguments

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