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

..

cache

sortAtom improvements

2015-08-28 23:52:27 +02:00

diseases

Merge branch 'master' into buttbots2

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

helper_datums

Fixes /datum/events, and by proxy the cable layer

2016-03-06 20:08:37 -05:00

spells

Merge branch 'byond510'

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

wires

Ports tg simple_animal bots

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

ai_law_sets.dm

Restore drone law order

2015-12-23 12:09:40 -08:00

ai_laws.dm

Port Bay's silicon law manager

2015-08-31 02:18:49 +02:00

beam.dm

Ports TG Beam Code and Medigun

2015-12-16 21:05:10 -05:00

browser.dm

HTML5 and CSS3 for NanoUI + Datum Browser

2015-11-06 11:27:32 -08:00

cargoprofile.dm

Merge branch 'byond510'

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

computerfiles.dm

…

datacore.dm

Woo everything's done

2016-02-01 09:19:05 -08:00

datumvars.dm

-tg- disease1

2016-03-27 21:24:00 -07:00

gas_mixture.dm

Gas Mixture Refactor and Speedup

2015-12-27 18:58:16 -05:00

hud.dm

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

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

martial.dm

welp

2016-03-26 14:59:07 +01:00

material_container.dm

Adds tranquillite

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

mind.dm

Refactors vampire abiliies to be spells

2016-03-10 07:01:31 -05:00

mixed.dm

Fixes Records

2015-12-05 19:01:51 -05:00

modules.dm

scream

2015-10-08 19:22:11 -04:00

periodic_news.dm

…

progressbar.dm

Ports tg's smooth progress bars

2016-03-28 04:24:26 -04:00

recipe.dm

…

spell.dm

Refactors vampire abiliies to be spells

2016-03-10 07:01:31 -05:00

supplypacks.dm

Merge branch 'master' into buttbots2

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

uplink_item.dm

Merge pull request #3944 from DaveTheHeadcrab/hitmanTators

2016-03-22 21:01:07 -04:00

vision_override.dm

Spelling and sanity fixes

2015-09-23 16:20:06 -04:00