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

..

computers

Merge branch 'byond510'

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

upload

…

bios.dm

…

buildandrepair.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

component.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

computer3_notes.dm

…

computer.dm

Bay/-tg- Meteor port

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

file.dm

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

laptop.dm

Last Few Destroy Fixes

2015-10-10 00:16:31 -04:00

lapvend.dm

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

networking.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

NTOS.dm

…

program_disks.dm

…

program.dm

Pass II

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

server.dm

…

storage.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

test_machines.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00