PsiOmegaDelta a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml

2015-09-11 08:54:03 +02:00

..

drilling

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

abandonedcrates.dm

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

2015-09-11 08:38:28 +02:00

alloys.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2

2015-09-01 03:22:08 +02:00

coins.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

machine_input_output_plates.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

machine_processing.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00

machine_stacking.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

machine_unloading.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

mine_items.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

mine_turfs.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

mineral_effect.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

mint.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

money_bag.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

ore_datum.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

ore.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

satchel_ore_boxdm.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00