Zuhayr 3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm

2015-08-22 03:11:53 +09:30

..

effects

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-10 17:56:14 +02:00

items

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-22 03:11:53 +09:30

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-22 03:11:53 +09:30

buckling.dm

…

empulse.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-10 12:57:46 +02:00

items.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

objs.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-12 21:18:18 +02:00

structures.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

weapons.dm

…