Poojawa 789064a3a5 Clean up .rej files

2017-06-28 02:24:03 -05:00

..

effects

Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588

2017-06-27 22:59:32 -05:00

items

Clean up .rej files

2017-06-28 02:24:03 -05:00

structures

Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588

2017-06-27 22:59:32 -05:00

buckling.dm

Fixes things getting unbuckled in nullspace (#1606)

2017-06-20 08:04:01 -07:00

empulse.dm

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2017-05-18 16:38:09 -05:00

items.dm

Stamina projectiles no longer set off grenades and flamethrowers

2017-06-22 11:00:13 -05:00

obj_defense.dm

upstream-merge-27971

2017-06-11 08:21:14 -05:00

objs.dm

upstream-merge-28109

2017-06-13 01:10:21 -05:00

radiation.dm

Fixes swarmers dying to radiation

2017-06-22 10:59:03 -05:00

structures.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

weapons.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00