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

..

ammunition

fixes chameleon laser guns blowing up welding tanks for real this time (#27443)

2017-05-20 23:22:26 -03:00

boxes_magazines

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

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

guns

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

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

projectile

fixes chameleon laser guns blowing up welding tanks for real this time (#27443)

2017-05-20 23:22:26 -03:00

ammunition.dm

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

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

box_magazine.dm

…

firing.dm

…

gun.dm

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

pins.dm

Fixes #26142 (#26174)

2017-04-14 01:49:45 -06:00

projectile.dm

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

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