Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories ...

# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm

2019-01-26 02:17:22 -05:00

..

effects

Ventilation

2019-01-15 23:56:26 -06:00

items

Merge branch 'master' into GunsAndGunAccessories

2019-01-26 02:17:22 -05:00

random

…

structures

Merge pull request #10715 from datlo/oxygengrenade

2019-01-25 07:47:24 +08:00

buckling.dm

…

empulse.dm

…

explosion.dm

frag grenades do not breach, have more radius

2018-12-18 04:12:09 +00:00

items.dm

Merge pull request #10185 from Mitchs98/moveresist

2018-12-28 20:53:07 +08:00

obj_defense.dm

Requested Fixes/Further Review

2018-11-11 19:44:35 -06:00

objs.dm

Merge pull request #10351 from Citinited/duct-tape-stick-tweak

2018-12-11 20:18:05 +08:00

structures.dm

Fixed tabling through solid objects.

2018-10-30 12:36:30 +01:00