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

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm

2015-06-20 20:40:06 +02:00

..

Accounts_DB.dm

Fixes #9847

2015-06-20 22:15:38 +09:30

Accounts.dm

Removes pin necessity on vending machines.

2013-10-21 07:12:23 -04:00

ATM.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

cash.dm

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

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

economy_misc.dm

Newscaster and photo cleanup

2014-11-06 13:28:17 +01:00

EFTPOS.dm

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

2015-06-04 08:10:49 +02:00

Events_Mundane.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

Events.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

TradeDestinations.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00