Mloc-Argent e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm

2014-05-14 22:42:03 +01:00

..

antimatter

Changes most viable, used entries of plasma with phoron.

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

singularity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

apc.dm

Allowed magnetic grippers to remove APC cells.

2014-05-12 14:51:55 +09:30

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

power: cables show up right on map again

2014-05-09 18:53:44 +01:00

cell.dm

Changes most viable, used entries of plasma with phoron.

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

engine.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

lighting.dm

Fixes a runtime with drones building lights.

2014-05-11 22:31:27 +09:30

pacman2.dm

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

2014-05-08 19:27:02 +01:00

port_gen.dm

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

2014-05-14 22:42:03 +01:00

power.dm

Removed my debug lines.

2014-03-08 03:55:22 -06:00

smes.dm

APC bugfix after someone messed with mah areas!

2014-04-01 03:06:58 -05:00

solar.dm

Changes most viable, used entries of plasma with phoron.

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

switch.dm

…

terminal.dm

…

tracker.dm

…

turbine.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00