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

..

organs

Merge branch 'byond510'

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

bones.dm

Merge pull request #3487 from Crazylemon64/slime_fancy_stuff

2016-03-08 20:18:51 -05:00

dental_implant.dm

pill limit

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

encased.dm

Surgery Tweaks

2016-03-04 21:47:41 -05:00

face.dm

Surgery Tweaks

2016-03-04 21:47:41 -05:00

generic.dm

mech drills

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

helpers.dm

its done

2016-02-12 03:04:24 -05:00

implant.dm

Allows you to close incisions made within embedded object removal surgery.

2016-03-26 23:35:24 -04:00

limb_reattach.dm

Makes DNA swapping methods more reliable

2016-03-17 23:07:45 -07:00

organs_internal.dm

moar fixes

2016-03-09 18:06:08 -05:00

other.dm

fixes

2016-03-24 17:50:34 -04:00

robotics.dm

moar fixes

2016-03-09 18:06:08 -05:00

slime.dm

Surgery Tweaks

2016-03-04 21:47:41 -05:00

surgery.dm

Surgery Tweaks

2016-03-04 21:47:41 -05:00

tools.dm

Robotics Sterile Surgery

2016-03-25 14:07:34 -04:00