skull132 16d33365c2 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

2017-09-09 21:38:02 +03:00

..

ammunition

Mounted guns names, grenades tweaks and projectiles changes (#3322)

2017-08-27 17:00:32 -05:00

guns

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

projectile

Adds some things (#3357)

2017-09-02 18:16:22 +02:00

targeting

DEvent, Mk II (#3241)

2017-09-06 18:08:44 +02:00

ammunition.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

effects.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

gun.dm

Convert guns to initialize (#3266)

2017-08-11 22:57:12 +03:00

projectile.dm

Ports baystation armor system (#2954)

2017-07-15 16:24:03 +03:00