Ergovisavi f5d800a06d Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero ...

# Conflicts:
#	icons/effects/96x96.dmi

2017-07-01 16:20:05 -07:00

..

ammunition

Ancient Space Station [Space Spawn Ruin] (#28584)

2017-06-25 12:02:31 -04:00

boxes_magazines

Removes donut steelpoint (#28041)

2017-06-05 00:12:26 -03:00

guns

Fixes reskinned guns being invisible

2017-06-30 16:05:59 -04:00

projectile

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -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

MoreSounds!

2017-05-23 22:32:16 +08:00

firing.dm

…

gun.dm

Moves reskinning items to /obj (#28558)

2017-06-21 15:19:17 -03:00

pins.dm

Fixes #26142 (#26174)

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

projectile.dm

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

2017-06-30 21:31:32 -07:00