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

..

devices

Merge branch 'byond510'

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

mountable_frames

…

robot

Refactors renaming so it works consistently

2016-02-19 21:03:33 -05:00

stacks

Cyborg wood is gone. I don't know why it was there in the first place.

2016-03-31 08:18:39 -04:00

weapons

Merge branch 'byond510'

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

ashtray.dm

…

blueprints.dm

Ports Advanced Cameras

2016-03-29 06:05:59 -04:00

bodybag.dm

…

candle.dm

…

changestone.dm

Changing a person's appearance now works better

2016-02-29 19:31:29 -08:00

contraband.dm

eating refactor (#3733) + bugfixes

2016-03-05 08:03:39 +00:00

crayons.dm

Merge branch 'byond510'

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

dehy_carp.dm

…

documents.dm

…

flag.dm

Tajara back to Tajaran

2015-12-17 16:57:12 -05:00

latexballoon.dm

…

misc.dm

…

policetape.dm

…

random_items.dm

eating refactor (#3733) + bugfixes

2016-03-05 08:03:39 +00:00

shooting_range.dm

…

toys.dm

Implements Goon's Gibbing Sounds

2016-03-06 23:05:07 -05:00

trash.dm

Snacks

2015-11-13 17:16:47 -05:00