kevinz000 6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor

2020-03-20 22:59:17 -07:00

..

ammunition

arrow craft nitpicking (alt title: "why are subtypes like this") (#11516)

2020-03-18 19:34:14 +01:00

boxes_magazines

I LOVE YOU KITCHEN GUN!

2020-03-17 03:20:53 +11:00

guns

Merge remote-tracking branch 'citadel/master' into shield_refactor

2020-03-20 22:59:17 -07:00

projectile

Nerfs HoS taser and warden stun pump action blaster (#11352)

2020-03-20 16:09:10 +01:00

gun.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00

pins.dm

Merge pull request #10993 from Linzolle/bows

2020-02-14 08:01:12 +01:00

projectile.dm

Merge remote-tracking branch 'citadel/master' into shield_refactor

2020-03-20 22:59:17 -07:00