duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

ammunition

Merge pull request #16402 from Core0verload/revert-15671-Newtaser

2016-03-28 18:44:34 -05:00

guns

Merge pull request #16507 from PKPenguin321/patch-16

2016-04-02 20:09:06 -04:00

projectile

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-03-30 22:55:00 -06:00

ammunition.dm

Nerfs the detective's revolver

2016-02-28 20:38:32 -03:00

firing.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

gun.dm

Heavy Weapon Fix

2016-03-31 12:23:46 -05:00

pins.dm

Fixes firing_pin not qdeling.

2016-01-17 16:06:36 +01:00

projectile.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00