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

..

holidays

Event updates

2015-09-17 21:34:51 +02:00

alien_infestation.dm

Fixes several midround antag assignments not asking ghosts first

2016-03-07 03:03:45 -05:00

anomaly_bluespace.dm

510: HUD, Flash Refactor, Rip out unused pain system

2016-02-28 18:09:43 -08:00

anomaly_flux.dm

Event updates

2015-09-17 21:34:51 +02:00

anomaly_grav.dm

Event updates

2015-09-17 21:34:51 +02:00

anomaly_pyro.dm

Event updates

2015-09-17 21:34:51 +02:00

anomaly_vortex.dm

Event updates

2015-09-17 21:34:51 +02:00

anomaly.dm

Event updates

2015-09-17 21:34:51 +02:00

blob.dm

Reclassified events based on github feedback

2016-01-13 01:39:17 -08:00

brand_intelligence.dm

More event tweaks

2015-09-17 22:25:35 +02:00

cargobonus.dm

Cargo controller fix

2015-02-28 23:32:27 +01:00

carp_migration.dm

More event tweaks

2015-09-17 22:25:35 +02:00

communications_blackout.dm

More event tweaks

2015-09-17 22:25:35 +02:00

disease_outbreak.dm

oh hell

2016-03-30 22:52:36 -04:00

dust.dm

Field Generator Refactor+Fixes

2015-12-22 13:40:53 -05:00

electrical_storm.dm

More event tweaks

2015-09-17 22:25:35 +02:00

event_container.dm

Fully Re-Activates Disease1

2016-03-30 22:31:59 -04:00

event_manager.dm

Shuttles: Research + Mining fixes

2015-12-15 18:19:34 -08:00

event.dm

Get_Area(), Event, and grab fixes

2015-05-12 17:04:28 -07:00

false_alarm.dm

More event tweaks

2015-09-17 22:25:35 +02:00

grid_check.dm

Consolidate power failure procs

2015-09-17 22:44:15 +02:00

immovable_rod.dm

More event tweaks

2015-09-17 22:25:35 +02:00

infestation.dm

Update event turf handling, fix infestation event

2015-09-18 17:38:15 +02:00

ion_storm.dm

Ports tg simple_animal bots

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

mass_hallucination.dm

flag split

2016-01-27 16:36:43 -05:00

meaty_ores.dm

More event tweaks

2015-09-17 22:25:35 +02:00

meteors.dm

Bay/-tg- Meteor port

2015-06-21 18:39:39 -07:00

money_hacker.dm

Prison break refactor, Requests Console refactor

2015-07-29 00:12:44 +02:00

money_lotto.dm

Event overhaul from Bay, atmos fixes

2015-01-21 23:05:59 +01:00

money_spam.dm

Adds PDA chatroom

2016-03-18 16:45:12 -04:00

prison_break.dm

More event tweaks

2015-09-17 22:25:35 +02:00

radiation_storm.dm

flag split

2016-01-27 16:36:43 -05:00

rogue_drones.dm

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

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

slaughterevent.dm

Fixes several midround antag assignments not asking ghosts first

2016-03-07 03:03:45 -05:00

spacevine.dm

Reclassified events based on github feedback

2016-01-13 01:39:17 -08:00

spider_infestation.dm

Pipenet overhaul

2015-09-21 02:11:54 +02:00

spontaneous_appendicitis.dm

oh hell

2016-03-30 22:52:36 -04:00

tear.dm

More event tweaks

2015-09-17 22:25:35 +02:00

undead.dm

More event tweaks

2015-09-17 22:25:35 +02:00

vent_clog.dm

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

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

wallrot.dm

More event tweaks

2015-09-17 22:25:35 +02:00

wormholes.dm

Event updates

2015-09-17 21:34:51 +02:00