PsiOmega fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm

2015-06-07 10:51:41 +02:00

..

crossbow.dm

Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev

2015-05-17 12:58:09 +09:30

grenade_launcher.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

pneumatic.dm

Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev

2015-05-17 12:58:09 +09:30

rocket.dm

Updates to science

2015-04-04 13:38:03 +03:00

syringe_gun.dm

Adds logging for syringe_gun

2015-06-06 17:02:42 -04:00