xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not ...

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-09-24 03:14:04 +01:00

..

ammunition

Instant merge is the fastest action type for this operation

2015-09-22 00:20:36 +03:00

guns

Merge remote-tracking branch 'upstream/master' into hot_or_not

2015-09-24 03:14:04 +01:00

projectile

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

2015-09-19 22:34:30 +02:00

ammunition.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

firing.dm

Adds zone_override var to process_fire and friends, updates clumsy and gun suicide

2015-09-20 16:52:39 +02:00

gun.dm

Merge pull request #11877 from Core0verload/suicide

2015-09-24 01:44:12 +03:00

pins.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

projectile.dm

Fixes ranged stuns causing slurring instead of stuttering. Fixes #8189

2015-08-13 12:49:18 +02:00