PsiOmega 5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm

2015-09-15 20:25:13 +02:00

..

food

Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon

2015-09-09 19:49:46 -04:00

glass

…

blood_pack.dm

…

borghydro.dm

Compilation fix.

2015-07-24 11:02:39 +02:00

dropper.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

food.dm

…

glass.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

hypospray.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-15 10:52:17 +02:00

pill.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-15 20:25:13 +02:00

spray.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-15 10:52:17 +02:00

syringes.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-15 10:52:17 +02:00