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

..

maploader

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

mission_code

Fixes some things for away missions, and a few missions themselves

2016-03-11 00:42:22 -05:00

bluespaceartillery.dm

Minor bluespace artillery interface update

2015-08-30 22:49:05 +02:00

corpse.dm

Another del->qdel pass

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

exile.dm

TG Implant Refactor/Overhaul

2016-01-16 01:50:10 -05:00

gateway.dm

fixes /blacks

2016-02-19 13:47:47 +00:00

loot.dm

Another del->qdel pass

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

pamphlet.dm

…

trigger.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

zlevel.dm

Fixes some things for away missions, and a few missions themselves

2016-03-11 00:42:22 -05:00