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

Conflicts:
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/living_defines.dm

2015-04-07 01:06:38 +02:00

..

ammunition

plasma/ripley update

2015-03-25 18:06:26 -05:00

guns

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

projectile

Some adjustments:

2015-04-02 17:39:02 +02:00

ammunition.dm

Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)

2015-03-21 16:18:32 +00:00

firing.dm

Fix reagent garbage collection hopefully

2015-03-14 16:52:49 -07:00

gun.dm

New pins

2015-03-28 22:02:44 +12:00

pins.dm

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

projectile.dm

Some adjustments:

2015-04-02 17:39:02 +02:00