Tigercat2000 519992b5a9 Merge branch 'byond510' ...

Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme

2016-04-01 14:15:44 -07:00

..

ammunition

Merge pull request #2722 from ZomgPonies/russian

2016-01-11 00:18:21 -05:00

guns

Heavily Rebalances Science

2016-03-09 02:58:05 -05:00

projectile

Adds tranquillite

2016-03-06 01:49:30 -05:00

ammunition.dm

Pass I

2015-09-04 05:18:48 -04:00

gun.dm

Merge branch 'byond510'

2016-04-01 14:15:44 -07:00

medbeam.dm

Medibeam and Guardian Fixes

2015-12-24 11:28:40 -05:00

projectile.dm

Removes Halloss

2016-03-03 23:26:41 -05:00

targeting.dm

Another del->qdel pass

2015-10-08 16:49:10 -04:00