Robustin eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3 ...

# Conflicts:
#	icons/obj/guns/projectile.dmi

2017-05-21 17:54:44 -04:00

..

ballistic

Merge branch 'master' of https://github.com/tgstation/tgstation into GG3

2017-05-21 17:54:44 -04:00

energy

Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#27380)

2017-05-21 06:16:31 -04:00

magic

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

ballistic.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

energy.dm

Replaces /image with /mutable_appearance, where appropriate (#26518)

2017-04-25 12:15:16 +02:00

grenade_launcher.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

magic.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

medbeam.dm

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

mounted.dm

Fixes armlasers breaking on retract

2017-04-19 19:12:56 -04:00

syringe_gun.dm

Adds modified syringe guns (#27276)

2017-05-19 08:24:37 -03:00