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

..

effects

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

items

Merge branch 'byond510'

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

random

Pass II

2015-07-09 19:51:40 -04:00

structures

Merge branch 'byond510'

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

buckling.dm

Made it check for recursive buckling again too

2015-11-09 02:29:18 -05:00

empulse.dm

EMP Fixes

2015-12-23 04:09:47 -05:00

explosion.dm

Removes btime dependency, makes sleep check happen on Every SCHECK

2016-03-01 22:20:19 -05:00

items.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

2016-02-24 06:27:16 -05:00

objs.dm

Ports tg simple_animal bots

2016-03-28 00:22:04 -04:00

structures.dm

-tg- smoothing/floor refactor

2016-01-03 19:24:13 -08:00

weapons.dm

…